Locking apps in landscape mode.
Merge branch 'master' into messaging

Conflicts:
	PatchfieldControl/AndroidManifest.xml