panel update
Merge branch 'master' of https://github.com/chanweitian/VA

Conflicts:
	WebContent/css/style.css
	WebContent/js/map.js