Merge GUI.
Merge branch 'master' of https://github.com/marcusnygren/Elements

Conflicts:
	resources/BottomGui.qml
	resources/GUI.qml
Merge branch 'master' of https://github.com/marcusnygren/Elements
Changes to the QML-files.
Merge branch 'master' of https://github.com/marcusnygren/Elements