[mrege] for demo.
Merge remote-tracking branch 'origin/db_for_html_mod'

Conflicts:
	src/main/webapp/gmap.html