save progress
save progress
save progress
Merge branch 'master' into ui-flow-update

Conflicts:

KindredPrints-Android-SDK/KindredPrints-Android-SDK/src/com/kindredprint
s/android/sdk/KindredOrderFlowActivity.java

KindredPrints-Android-SDK/KindredPrints-Android-SDK/src/com/kindredprint
s/android/sdk/fragments/CartPageFragment.java

KindredPrints-Android-SDK/KindredPrints-Android-SDK/src/com/kindredprint
s/android/sdk/fragments/CartViewPagerFragment.java

KindredPrints-Android-SDK/KindredPrints-Android-TestBed/src/com/kindredp
rints/sdk/testbed/MainActivity.java
save progress
save progress
working intro page - design still messed up though
pretty sexy update
save progress
bug fix - usability fixes
warning on no shipment
some layout stuff
save progress
save all fixes
save progress
updated small screen views
bunch o' fixes
clear key
Merge branch 'ui-flow-update'

Conflicts:

KindredPrints-Android-SDK/KindredPrints-Android-TestBed/src/com/kindredp
rints/sdk/testbed/MainActivity.java