Gestion inApp
Merge branch 'master' of https://github.com/jpwilsch/mysmartping

Conflicts:
	src/main/webapp/scripts/app.js