I believe device id and location are working

I modified the server request to determine a unique ID and to attempt to
get location. If it cannot get location, it will prompt the user with an
error message, but CURRENTLY NOT TRY AGAIN
Merge branch 'master' of https://github.com/balvarez/app1

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex