Various minor changes
Commiting uncommited files from master branch on BB.
Merge branch 'master' of https://github.com/ultralaserdeluxe/gloria
Merge branch 'master' of https://github.com/ultralaserdeluxe/gloria into regulator_dev