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

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
Merge branch 'master' of https://github.com/LoudRobed/ordsplid.git
sd