Implemented two methods
Merge branch 'akifnewbranch'

Conflicts:
	app/model/Dummy.scala