moo
moo
Merge branch 'master' of https://github.com/IggyIguana/exonian

Conflicts:
	bin/Exonian.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/app/exonian/ArticleActivity$1.class
	bin/classes/app/exonian/ArticleActivity$DownloadArticle$1.class
	bin/classes/app/exonian/ArticleActivity$DownloadArticle$2.class
	bin/classes/app/exonian/ArticleActivity$DownloadArticle.class
	bin/classes/app/exonian/ArticleActivity$DownloadImage$1.class
	bin/classes/app/exonian/ArticleActivity$DownloadImage.class
	bin/classes/app/exonian/ArticleActivity.class
	bin/classes/app/exonian/HomeActivity$ExonianFragment$1.class
	bin/classes/app/exonian/HomeActivity$ExonianFragment.class
	bin/classes/app/exonian/HomeActivity$SectionsPagerAdapter.class
	bin/classes/app/exonian/HomeActivity.class
	bin/classes/app/exonian/R$color.class
	bin/classes/app/exonian/R$id.class
	bin/classes/app/exonian/R$menu.class
	bin/classes/app/exonian/R$string.class
	bin/classes/app/exonian/R$style.class
	bin/classes/app/exonian/R$styleable.class
	bin/classes/app/exonian/SearchActivity$1.class
	bin/classes/app/exonian/SearchActivity.class
	bin/classes/com/facebook/android/R$color.class
	bin/classes/com/facebook/android/R$dimen.class
	bin/classes/com/facebook/android/R$id.class
	bin/classes/com/facebook/android/R$string.class
	bin/classes/com/facebook/android/R$style.class
	bin/res/crunch/drawable-hdpi/ic_launcher.png
	bin/res/crunch/drawable-mdpi/ic_launcher.png
	bin/res/crunch/drawable-xhdpi/ic_launcher.png
	bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	bin/resources.ap_
	gen/app/exonian/R.java
	gen/com/facebook/android/R.java
	project.properties
	src/app/exonian/ArticleActivity.java