Make sure to work in the correct branch

Make sure to work in the correct branch
Merge branch 'master' into templating

Conflicts:
	js/notes.txt