bugfix
fix
Merge branch 'master' of https://github.com/phiree/testttt

Conflicts:
	DiJieSheWeb/config/authentication.config