Fixed issue with admin user

Merge branch 'master' of https://github.com/sachindeshpande/sample_app

Conflicts:
	.idea/.rakeTasks
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/sample_app.iml
	.idea/workspace.xml
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/views/layouts/_header.html.erb
	spec/requests/authentication_pages_spec.rb