Merge branch 'gh-pages', remote-tracking branch 'origin' into development
CLEANUP
Merge branch 'development', remote-tracking branch 'origin' into gh-pages