Fixed merge
Merge branch 'master' into manual_uppdate
Added settings stuff
Modified files for settings
added settings to footer
Added facebook
fixed facebook opening browser/app
Fixed icons on startpage and added bugreports/feedback button in settings menu
Merge branch 'master' of https://github.com/ifiske/iFiske into settings_menu
Removed unnecessary code
Removed info button from start
Merge pull request #23 from ifiske/settings_menu

Settings menu
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 button_concept