fix
Merge branch 'develop' of github.com:meriadec/kaamelox into develop

Conflicts:
	app/index.html