helper for title
refactoring
Merge branch 'feature/fix_bug_title_admin-33' into staging
add_photo
Merge branch 'feature/add_photo_for_instructors-53' into staging

Conflicts:
	app/controllers/web/instructors_controller.rb
Merge branch 'staging' of github.com:kaize/castle into staging