Signed-off-by: shadowedge <gulixing@msn.com>
Merge branch 'master' of https://github.com/shadowedge/keter-project.git

Conflicts:
	web/src/main/webapp/WEB-INF/logs/error.log

Signed-off-by: shadowedge <gulixing@msn.com>


Signed-off-by: shadowedge <gulixing@msn.com>


Signed-off-by: shadowedge <gulixing@msn.com>


Signed-off-by: shadowedge <gulixing@msn.com>
Merge branch 'master' of https://github.com/shadowedge/keter-project.git

Conflicts:
	web/src/main/resources/db.properties

Signed-off-by: shadowedge <gulixing@msn.com>


Signed-off-by: shadowedge <gulixing@msn.com>