Add build.xml and exclude local.properties from git.
Merge branch 'master' into abc
Add error handling on uploading location.