update
Merge branch 'master' of https://github.com/kychill1986/mav

Conflicts:
	target/m2e-jee/web-resources/META-INF/maven/com.yang.mav/mav/pom.properties
add mvc output json/xml support