integrate ehcache
Merge remote-tracking branch 'origin/develop'
add the comment to encache and Constant class
Merge branch 'master' of https://github.com/hyxiaodili/12306ngweb
change the log4j configuration
add log4J manager
resolve the conflict
Merge branch 'master' of http://github.com/hyxiaodili/12306ngweb into hyxiaodili-master
Merge branch 'hyxiaodili-master' into develop