Merge branch 'master' of
https://github.com/ZeRoberto27/MWI2_MobileComputing.git

Conflicts:
	CityBike/.classpath
http-Get und Entity
Merge branch 'master' of
https://github.com/ZeRoberto27/MWI2_MobileComputing.git