Annotate code for change hash
Merge in development
Merge branch 'development' into back-button
Make minor improvements to JS