basic auth
fix http admin auth
merge commit, changing css and footer file
merge commit, applied both changes in photo albums controller
Merge branch 'feature/79-add-union-field' into develop

* feature/79-add-union-field:
  fixed problem with union field in admin module
  added union field to admin
remove http_login method call in tests
Merge branch 'feature/full-text-search-69' into develop
Merge branch 'feature/admin_auth-78' into develop
remove test_auth_helper
admin block crud
add locales for block
add block validations
sort blocks in admin
Merge branch 'feature/blocks-86' into staging

Conflicts:
	app/assets/stylesheets/application.css.less
	app/views/layouts/web/shared/_footer.html.haml
	lib/auth_helper.rb
	test/functional/web/admin/activities_controller_test.rb
	test/functional/web/admin/categories_controller_test.rb
	test/functional/web/admin/events_controller_test.rb
	test/functional/web/admin/group_schedule_classrooms_controller_test.rb
	test/functional/web/admin/groups_controller_test.rb
	test/functional/web/admin/instructors_controller_test.rb
	test/functional/web/admin/news_controller_test.rb
	test/functional/web/admin/pages_controller_test.rb
	test/functional/web/admin/partners_controller_test.rb
	test/functional/web/admin/photo_albums_controller_test.rb
	test/functional/web/admin/study_requests_controller_test.rb
	test/functional/web/admin/unions_controller_test.rb
	test/functional/web/admin/welcome_controller_test.rb