updated dependencies
Merge branch 'master' into jersey-2

Conflicts:
	tajin-framework/framework/pom.xml
updated dependencies