add form entity
Merge branch 'master' of https://github.com/wjf3121/ShareTheTraining

Conflicts:
	app/controllers/UserController.java