1. fix error
Merge branch 'master' of github.com:ShevYan/crossP

Conflicts:
	CrossPServer/src/main/resources/static/js/app.js