Commit before merge
Merge branch 'master' of https://github.com/ShopbotTools/FabMo-Dashboard
Continued project reorganization