na
Merge branch 'master' of https://github.com/gdeioannes/multiploc

Conflicts:
	js/multiploc3.js
	multiploc.html