Fixed merge
Merge branch 'master' into manual_uppdate
Merge branch 'master' into manual_uppdate

Conflicts:
	ifiske-app/www/static/templates/start.handlebars
Moved the button into settings
Changed the update button to be a regular button
Removed an unused image
removed unused css file
Merge pull request #17 from ifiske/manual_uppdate

manual update button
Merge branch 'master' into area