go on study
update
Merge branch 'master' of https://github.com/yirankiller/ikiller

Conflicts:
	yirankiller-web/yirankiller-web-IJFY-ROOT.war/src/main/webapp/javascript/index.js
	yirankiller-web/yirankiller-web-IJFY-ROOT.war/src/main/webapp/javascript/seaJsJQuery/UI/1.8.21/jquery.ui.tabs.js
Merge branch 'master' of https://github.com/yirankiller/ikiller