1.4.2
Merge branch 'master' of https://github.com/meefik/linuxdeploy.git

Conflicts:
	AndroidManifest.xml