Tries to fix issue #7

took 3h
Merge branch 'master' of https://github.com/ifiske/ifiske

Conflicts:
	ifiske-app/www/index.html
	ifiske-app/www/static/js/navigate.js
Removed old backkey
Fixes #1

took 2h
Merge branch 'master' of https://github.com/ifiske/ifiske

Conflicts:
	ifiske-app/www/static/js/navigate.js