update from Budi
Merge branch 'master' of https://github.com/iMMAP/OasisWebMapping

Conflicts:
	mapfile/ol_base.map