Minor styling fixes
Merge branch 'development' of https://github.com/adlnet/Sandbox into development
Merge branch 'development' into v0.4.5_candidate