move translation to model
Merge branch 'feature/translate_admin_panel_#30' into develop
Merge branch 'feature/27_scroll_spy' into develop

Conflicts:
	app/views/layouts/web/application.html.haml
Merge branch 'feature/disqus' into develop

Conflicts:
	app/views/web/news/show.html.haml
Merge branch 'feature/instructors_to_groups' into develop

Conflicts:
	.gitignore
Merge branch 'feature/design_edit_29' into develop
add models for photos and albums
migrations for photo and album
add route for photo album
add photo and album
add link to menu
add views for photo_album
add tests and factories for phto_album
add controller for photo_album
add carierwave and metasearch
fix search
add uploader for photo
add type for photo_album
add locales for photo album
from meta_search to ransack