Consolidated external qml files to hopefully prevent crashing bug
Merge branch 'hotfix/2'