Merge branch 'master' into Develop
EOD

Didn't accomplish much. Just some UI issues
Merge branch 'Develop'