UI change
Merge branch 'master' of https://github.com/lawrencebla/WebDemo

Conflicts:
	js/gen/template.js