jjs 0330 commit
Merge branch 'ctblasts_android_dev1' of https://github.com/mycart/ctblasts_android into ctblasts_android_dev1