upgrade component and gitignore
Merge branch 'master' of github.com:maochen/TemplateCode

Conflicts:
	JerseyRESTwMaven/pom.xml
fix conflict