Merge branch 'Feature#71' into dev

Conflicts:
	.idea/Sprint-1.iml
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/workspace.xml
	Gemfile
	app/controllers/users_controller.rb
	app/views/layouts/application.html.erb
	config/initializers/recaptcha.rb