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

Conflicts:
	src/com/wise/article/ArticleActivity.java