maven pom.xml
show article and comments
Merge branch 'master' of https://github.com/hillyou/appengine.git

Conflicts:
	vish/pom.xml