map sample
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/charts.php
	public/script/init.js
map fix