change user model
del allen, huang, jeff for importing
Merge branch 'develop' of https://github.com/shidh/CSSA into develop

Conflicts:
	app/models/User.java
	conf/initial-data.yml