backup for ..
backup for ..
backup for ..
new update..
Merge branch 'master' of https://github.com/yirankiller/ikiller

Conflicts:
	yirankiller-flower/src/main/webapp/WEB-INF/springmvc-servlet.xml
	yirankiller-flower/src/main/webapp/index.jsp
Merge branch 'master' of https://github.com/yirankiller/ikiller

Conflicts:
	yirankiller-flower/src/main/webapp/WEB-INF/springmvc-servlet.xml
	yirankiller-flower/src/main/webapp/index.jsp
Merge branch 'master' of https://github.com/yirankiller/ikiller

Conflicts:
	yirankiller-flower/src/main/webapp/WEB-INF/springmvc-servlet.xml
	yirankiller-flower/src/main/webapp/index.jsp
remove jdbc  , add tpl