some things...
Fixes merge conflicts
Fixes merge conflicts
Removes unused Header from Gravitron.pro
Adds sample property binding
fix merge
edit filename (nameingconventions); add aliasnames in qrc files; move headers in headers folders
change qml buttons to QtQuick.Controls buttons; add settings properties