[API]Register
Merge branch 'master' of https://github.com/lopesdasilva/etoile

Conflicts:
	etoile-play/app/controllers/ApiController.java
	etoile-play/conf/routes