sync with on wiki version
Merge branch 'master' of toolserver:git/wmajs
Merge branch 'master' of github.com:dschwen/wikiminiatlas

Conflicts:
	wikiminiatlas.js