a
Merge remote-tracking branch 'origin/dev_v2' into dev_v2

Conflicts:
	app/src/main/AndroidManifest.xml
a