Fixing a few things.
Merge branch 'master' of https://github.com/dnobel/kaminodroid

Conflicts:
	source/kaminodroid-backend/src/main/webapp/js/utils/Utils.js