Merge branch 'bug-ajax-progress-message'
still working on better messaging
minor fixes
Merge branch 'development'
Merge branch 'master' into development