some cosmetics etc
Merge branch 'master' of https://github.com/hjujah/kladno

Conflicts:
	www/js/views/navigator.js