updated old to latest build
Merge branch 'master' of https://github.com/ROGUE-JCTD/MapLoom
Merge branch 'master' of https://github.com/ROGUE-JCTD/MapLoom into init_from_config

Conflicts:
	ol3/ol-simple.js
	ol3/ol-whitespace.js
	ol3/ol.js