commit 3
Merge branch 'ctblasts_android_dev1' of github.com:mycart/ctblasts_android into ctblasts_android_dev1

Conflicts:
	gen/com/aviary/android/feather/R.java
	gen/com/ctblasts/R.java