Changed watch.sh's permissions, added template inheritance
Merge branch 'master' of https://github.com/weshack/WesmapsPlus

Conflicts:
	templates/index.html
Updated layout.html