Merge remote-tracking branch 'origin/develop'
pulled in latest from development, docs update, class restructure'
updated docs