blbl
Merge branch 'master' of https://github.com/ACPLMaverick/marjan

Conflicts:
	PSG_Marcin/Engine2D/Engine2D.v12.suo
	PUM/workspace/CarTracker/gen/com/plodz/cartracker/R.java
	PUM/workspace/CarTracker/res/layout/fragment_statistics.xml
	PUM/workspace/CarTracker/res/values/strings.xml
	PUM/workspace/CarTracker/src/com/plodz/cartracker/MapController.java
	PUM/workspace/CarTracker/src/com/plodz/cartracker/TrackActivity.java
	PUM/workspace/CarTracker/src/com/plodz/cartracker/TrackingController.java
added pum