minor changes
Merge branch 'master' of github.com:InnovaLangues/kinephone-api

Conflicts:
	web/index.php