release v1.2.5
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/AndroidManifest.xml