321
Merge branch 'master' of https://github.com/wisegps/Wawc.git

Conflicts:
	res/layout/article_adapter.xml