Merge branch 'master'

Conflicts:
	README.md
	conf/_install/dependency.xml
	module/javascript/app/vmap/map/mapcompare.js
	src/module_vmap/module/javascript/app/vmap/map/mapcompare.js
	utils/init_subtrees.sh
	utils/pull_subtrees.sh
	utils/push_subtrees.sh