Ugly hack for crash when refreshing feed.
Fixed (hacked) refresh feed.
Fix NPE crash
tab -> spaces
Merge remote-tracking branch 'origin' into HEAD

Conflicts:
	android-sdk-ui/src/com/appboy/ui/adapters/AppboyListAdapter.java
	android-sdk-ui/src/com/appboy/ui/widget/BaseCardView.java

Also modifies a fix made on this branch to more generically fix the case where we try to replace an existing news feed with a feed that has less cards, which would have caused a crash before.
Slight formatting and comment update
Updating changelog for bugfix.
Fixing duplicate imports.
Fixing duplicate imports.
Merge pull request #17 from Appboy/feature/feedFix

Feature/feed fix