Resolve conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	PSMapRoute/AndroidManifest.xml