additional data can be saved amendments
added some changes
fixed some bugs
indicator in different folder
clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	NeighborhoodPSS/.classpath
	NeighborhoodPSS/src/main/java/org/visico/neighborhoodpss/gwt/server/project/ScenarioServiceImpl.java
Merge remote-tracking branch 'origin/master'
provide the right version of the c3p0 connection manager