Merge pull request #41 from benjohnde/DBMigration

Db migration
Revert "Db migration"
Merge pull request #42 from benjohnde/revert-41-DBMigration

Revert "Db migration"
Merge branch 'master' into DBMigration

Conflicts:
	app/models/db2/Users.java