Merge
Merge
Merge remote-tracking branch 'brad/master'

Conflicts:
	AndroidManifest.xml
merge