phoebe: ready to merge with fixed ejs code
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project
phoebe: merging
Conflicts:
	userinterface/js/maps.js