finalized patches
Merge branch 'development' of github.com:Ortus-Solutions/ContentBox into development