Needed to change build to new tools.
Merge branch 'master' of https://github.com/phun/SofarAndroidApp
Merge branch 'master' of https://github.com/phun/SofarAndroidApp
Merge branch 'master' of https://github.com/phun/SofarAndroidApp into json
Merge branch 'json' of https://github.com/phun/SofarAndroidApp into json
ugh, more changes