Merge pull request #15 from tobias-/i18n

i18n -  Extract string
Move .gitignore to root
tab -> spaces
Merge pull request #14 from tobias-/gitignore

Add .gitignore
Merge pull request #12 from tobias-/customize_feed

Make spacing at top and end of feed customizable
Updating the Appboy Android UI library to v1.3.1.
Update CHANGELOG.md
Merge branch 'bugfixes'
Merge branch 'fix_warnings'

Conflicts:
	android-sdk-ui/src/com/appboy/ui/actions/WebAction.java
	android-sdk-ui/src/com/appboy/ui/slideups/SlideupViewWrapper.java
	android-sdk-ui/src/com/appboy/ui/widget/AppStoreReviewCardView.java
	android-sdk-ui/src/com/appboy/ui/widget/BannerImageCardView.java
	android-sdk-ui/src/com/appboy/ui/widget/CaptionedImageCardView.java
	android-sdk-ui/src/com/appboy/ui/widget/CrossPromotionSmallCardView.java
	android-sdk-ui/src/com/appboy/ui/widget/ShortNewsCardView.java
	android-sdk-ui/src/com/appboy/ui/widget/TextAnnouncementCardView.java
Merge branch 'intent'

Conflicts:
	android-sdk-ui/src/com/appboy/ui/actions/ActivityAction.java
	android-sdk-ui/src/com/appboy/ui/widget/BaseCardView.java