update local
update demo page
Merge branch 'master' of https://github.com/TonyDon/txcms-web.git

Conflicts:
	.gitignore