fgegs
u
Merge branch 'master' of https://github.com/Institute-Web-Science-and-Technologies/GeoVisualization into patrick

Conflicts:
	source/GUIPrototype/gen/android/support/v7/appcompat/R.java
	source/GUIPrototype/gen/com/example/guiprototype/R.java
	source/GUIPrototype/project.properties