remove unused migration
add devise gem
add user migration to add devise fields
add devise login view and support for devise authentication
add rest of devise views for customization
Merge branch 'develop' into features/devise
start work on custom mailer for devise
add test section to project yml
add action_mailer host config for test emails
remove unused factories
comment invalid account test
Merge branch 'master' into features/devise

Conflicts:
	Gemfile.lock
update devise signup page to haml and existing style
fix sign in with devise
update project alerts configurations
add signup controller that inherits from devise
real fix for sign in with devise
add signup controller tests
Merge branch 'master' into features/devise

Conflicts:
	app/controllers/users_controller.rb
add simple_form checkbox wrappers
style login form
Merge branch 'master' into features/devise

Conflicts:
	db/schema.rb
Merge branch 'master' into features/devise
update schema and change migration to work with master after merge
randomise confirmation token for existing users during add devise migration
fix create admin in seed to succeed password min length rule