first page
Merge branch 'master' of ssh://10.100.90.200/home/git/qasite
add db config
Finish configuration of my batis and freemarker
sso function
sso functions
add worklog mvc
merge conflict
test route
Merge branch 'master' into sso
change chinese char
1.remove un-used velocity config 2.change database password 3.update
index.html to index.ftl and remove useless html dir
change to freemarker
Merge remote-tracking branch 'qasite/worklog' into sso

Conflicts:
	src/main/webapp/WEB-INF/spring/webapp-config.xml
freemarker migration
add sql
modified mysql.properties
Merge remote-tracking branch 'qasite/worklog' into sso
change footer of index.ftl
add toolslink