Resolved #6
Took 3h
Merge branch 'master' into database

Conflicts:
	ifiske-app/www/index.html