Merge branch 'master' into database

Conflicts:
	ifiske-app/www/index.html
Resolved #6, fixes #3
Took 3h
Merge branch 'master' of https://github.com/ifiske/ifiske
TEST COMMIT PLEASE IGNORE
Added context handling to Navigate (localStorage default)
Start now handles logged in users
Added comments to navigate.js and login.js
Merge branch 'master' into marko

Conflicts:
	ifiske-app/www/static/js/navigate.js
fixed typo in navigate.js
re-added accidentally removed icon
Merge branch 'marko'
Added logout button
Merge branch 'logout_btn'
Tries to fix issue #7

took 3h
Added placeholder templates for registering, etc
Added placeholder templates
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
Merge branch 'database' of https://github.com/ifiske/ifiske into database
Merge branch 'master' into database

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