Using http verbs (API REST)
Merge branch 'master' of https://github.com/Serli/swear-box

Conflicts:
	app/controllers/Administration.java
	conf/routes