update to jdk1.7
Merge branch 'dev3' of github.com:semistone/rent into dev3
add tomcat
Merge branch 'dev3' of github.com:semistone/rent into dev3
Merge branch 'dev3' of github.com:semistone/rent into dev3
Merge branch 'dev3' of github.com:semistone/rent into dev3
fix test