inti subject
Merge branch 'master' of https://github.com/benki2012/MyExercise

Conflicts:
	app/controllers/admin/Application.java