Merge remote-tracking branch 'origin/oxe'

Conflicts:
	WebContent/debug.jsp
dataTransfer
DataTransfer
DataTransfer(maybe use mysql more simple)
Merge branch 'master' into oxe