Merge branch 'js' into html
Added a commonly-used wrapper <div> to template
Merge branch 'html'
Updated some comments in notifications.js