Merge pull request #239 from jlipps/master

allow custom activity string for android
add android app rebuilding and uicatalog downloading to reset.sh