Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaExercise/WebContent/admin/css/charisma-app.css
	JavaExercise/WebContent/admin/index.html
	JavaExercise/WebContent/admin/js/charisma.js
xxx