Gunsmith
Merge branch 'master' of https://github.com/E-Group/sqat

Conflicts:
	src/cn/sqat/controller/LoginServlet.java