Adding dao and models
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.java
	app/views/add.scala.html
	app/views/index.scala.html
	app/views/indexLogined.scala.html
	conf/routes
Merge fix