Updated templates and js
Merge branch 'master' of https://github.com/KamranAsif/gemwall

Conflicts:
	js/main.js
	js/tree.js