commit
add colorbox test
Merge branch 'feature/edit_photo_at_news-59' into staging

Conflicts:
	app/assets/stylesheets/application.css