new recordactivity
Merge remote-tracking branch 'origin/master'
resolve conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml