s
Merge branch 'master' of https://github.com/LoudRobed/ordsplid.git

Conflicts:
	bin/AndroidManifest.xml