introduced active-admin with and skipped users
configured active_admin with ordinary users
fixed role? method in user model
user and website can be configured via active_admin
user view shows all websites if user.role? :admin
finally set up factory girl with devise users
rake db:migrate changed db/schema.rb for admin notes
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
@wip: started to write cucumber tests with user login steps
introduced pickle gem
added standard step definitions of pickle
commented out root domain for mailer in test environment since user
factories are confirmed low level with confirmed_at attribute
added first user cucumber test with pickle - works
replaced user cucumber test with scenario outline
added user login helper step definition
user is restricted to his own profile unless admin
wrote cucumber test for this scenario
removed unneccessary user_authenticate! in user controller
commented lines in spec_helper so rake rspec runs - although fails
added custom rake task to run spec and cucumber tests
added admin cucumber test
rspec and cucumber tests now working
Merge branch 'master' into addedHighVoltage

Conflicts:
	Gemfile
	Gemfile.lock
added custom ignores to match static websites
implemented static file serving in websites controller
implemented custom_authentication in websites controller