[nGrinder for Cubrid test]
Merge branch 'forcubrid' of https://github.com/lzfcome/ngrinder.git into forcubrid

Conflicts:
	ngrinder-controller/src/main/webapp/WEB-INF/ftl/index.ftl