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

Conflicts:
	bin/Exonian.apk
	bin/classes.dex
	bin/classes/app/exonian/ArticleActivity$DownloadArticle.class
	bin/classes/app/exonian/HomeActivity$NewsFragment$1.class
	bin/classes/app/exonian/HomeActivity$NewsFragment.class
	bin/classes/app/exonian/HomeActivity$SectionsPagerAdapter.class
	bin/classes/app/exonian/HomeActivity.class
	bin/classes/app/exonian/SearchActivity$SearchArticle$1.class
	bin/classes/app/exonian/SearchActivity$SearchArticle.class
	bin/classes/app/exonian/SearchActivity.class
	bin/resources.ap_
Merge branch 'master' of https://github.com/IggyIguana/exonian

Conflicts:
	bin/Exonian.apk
	bin/classes.dex
	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.class
	bin/classes/app/exonian/R$dimen.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$xml.class
	bin/classes/app/exonian/R.class
	bin/classes/app/exonian/SearchActivity.class
	bin/resources.ap_
	gen/app/exonian/R.java