.
Merge branch 'master' of https://github.com/anjungdae/waku.git

Conflicts:
	waku/WebContent/waku/js/map.js