add role for user and change user edit admin form
add lectors controller and routes
Merge branch 'feature/edit_admin_panel_#104' into staging
Merge branch 'feature/move_news_page_to_main_page_#79' into staging
fix factories
add role for user and change user edit admin form
add lectors controller and routes
hide facebook button and fix user images
Merge branch 'feature/99_lectors_page' of https://github.com/kaize/nastachku into feature/99_lectors_page

Conflicts:
	app/models/user.rb
	app/views/web/admin/users/_form.html.haml
	app/views/web/lectors/index.html.haml
Merge branch 'feature/edit_admin_panel_#104' into staging
Merge branch 'feature/99_lectors_page' into staging

Conflicts:
	Gemfile
	app/views/web/admin/users/edit.html.haml
	test/factories/sequences.rb
	test/factories/user.rb
Merge branch 'staging' of https://github.com/kaize/nastachku into staging
add force downcase city attr
add downcase user city field migration
Merge branch 'develop' into staging

Conflicts:
	test/factories/sequences.rb
	test/factories/user.rb
Merge branch 'feature/edit_admin_panel_#104' into staging
Merge branch 'feature/move_news_page_to_main_page_#79' into staging
Merge branch 'feature/participant_page_#6' into staging
add role for user and change user edit admin form
add lectors controller and routes