Replace menubar by a toolbar on bottom, like the mockup.
Merge branch 'origin/master'

Conflicts:
	resources/resources.qrc
Merge branch 'upstream/master'
Merge branch 'origin/master'
Merge branch 'upstream/master'
Resized Icons in Toolbar to 16x16
Merge pull request #50 from Schlumpf/settings-menu-button

Settings menu button