Merge branch 'dev'
don't include this yet
fix bug that caused JS errors on certain home pages
Merge branch 'master' into dev