Updated version
Fix bug #2
Merge branch '0.1.3.1' into 0.1.4

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml