Merge pull request #34 from topcircler/master

Server URL defaults to prod; create user if user id doesn't exist.
Update AndroidManifest.xml
Update version.properties
Update version.properties
Update AndroidManifest.xml
Update AndroidManifest.xml
merge David's new string constants.
Merge remote-tracking branch 'upstream/master'