code version =  13
Merge remote-tracking branch 'origin/working' into working

Conflicts:
	src/main/AndroidManifest.xml
code version =  14