jquery cycle plugin
Merge branch 'master' of https://github.com/tengma/web_project.git
update tomcat to 7