phoebe: starting to add images back into flags.. work in progress
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project
phoebe: merging for image uploading functionality
Conflicts:
	routes/flags.js
	userinterface/js/maps.js