Master build error fix (android sdk)
Merge branch 'katelyn'

Conflicts:
	OriginalOrigins.git/branches/Origin_V6k.apk
Merge branch 'EDevelopment'

Conflicts:
	OriginalOrigins.git/branches/ProjectSettings/ProjectSettings.asset
added some sound. Still cant get audio listeners to work when approaching audio sources. Must sleep.
Merge remote-tracking branch 'origin/develop' into EDevelopment

Conflicts:
	OriginalOrigins.git/branches/ProjectSettings/ProjectSettings.asset

Only conflict was the keystore
Fixed the merge with matt's additions