finally set up factory girl with devise users
rake db:migrate changed db/schema.rb for admin notes
Merge branch 'master' of github.com:teamaker/WebsiteManagement

Conflicts:
	test/factories/user_factory.rb