Fixing Android Maps

in process

06-06 22:58:31.706: W/BroadcastQueue(647): Permission Denial: receiving Intent { act=com.google.android.maps.api.action.TOKEN_RESPONSE flg=0x10 pkg=edu.oregonstate.edu.oddjobmapscloud (has extras) } to ProcessRecord{4294b248 20997:edu.oregonstate.edu.oddjobmapscloud/u0a10116} (pid=20997, uid=10116) requires edu.oregonstate.edu.oddjobmapscloud.permission.MAPS_RECEIVE due to sender com.google.android.apps.maps (uid 10101)
Merge branch 'master' of https://github.com/martilar/OddJobMapsCloud

Conflicts:
	tiapp.xml