Fixed merge errors.
Merge branch 'TEST' of https://github.com/bceskavich/compas into TEST

Conflicts:
	compas/app/models/user.rb
	compas/db/schema.rb