Merge remote-tracking branch 'origin/tajin-framework-2.x'

Conflicts:
	tajin-framework/all/pom.xml
	tajin-framework/bootstrap/pom.xml
	tajin-framework/pom.xml
Merge branch 'master' of github.com:Ovea/tajin
Merge remote-tracking branch 'origin/master'
bugfix