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'