demo 前台 修改
Merge branch 'master' of https://github.com/AAATEAM/wte.git
Merge branch 'master' of https://github.com/AAATEAM/wte.git

Conflicts:
	wte/src/main/webapp/pmenu.ftl
NRJ demo 前台改进
Merge branch 'master' of https://github.com/AAATEAM/wte.git
Merge remote-tracking branch 'origin/master'
Merge branch 'local'