[212] fixed #33
[214] fixed #31
[215] Merge branch '#31_002' into version_1.4_beta

Conflicts:
	AndroidManifest.xml