Installed devise
rendered devise views
Merge branch 'dev' into feature/users

Conflicts:
	config/routes.rb
	db/schema.rb
Solving merge conflicts.
Merge branch 'feature/users' into dev
Merge branch 'dev' of https://github.com/ASE-2014/autotrade into dev

Conflicts:
	config/routes.rb
	db/schema.rb