Added models and DAO
Merge remote-tracking branch 'origin/master' into avirmani/dao

Conflicts:
	app/models/Users.scala