modify top frame & menu frame
Merge branch 'master' into echo_local

Conflicts:
	wte/src/main/resources/database-${db}.properties
	wte/src/main/webapp/pmenu.ftl
	wte/src/main/webapp/top.ftl
modify menu