Merge remote-tracking branch 'origin/master'

Conflicts:
	App/src/main/AndroidManifest.xml
Merge remote-tracking branch 'origin/master'