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

Conflicts:
	src/app/exonian/ArticleActivity.java