integrated mediaPlayer
Merge branch 'master' of github.com:osm2po/snapp

Conflicts:
	libs/osm2po-sd-0.1.2.jar
	libs/osm2po-sd-0.1.6.jar
	libs/osm2po-sd-1.0.16.jar