Conflicts:
	app/assets/javascripts/boards/boards_bundle.js
	app/assets/javascripts/boards/services/board_service.js
	spec/javascripts/boards/mock_data.js