Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS into 4.7.0

# Conflicts:
#	src/main/webapp/WEB-INF/manager/include/head-file.ftl

src/main/webapp/static/plugins/jBox/0.3.2/audio/LICENCE.txt

+blop.mp3 sound file recorded by Mark DiAngelo
+Downloaded from http://soundbible.com/2067-Blop.html
+
+All other files created by rjsken (http://www.fiverr.com/rjsken)
+All files are royalty free (http://en.wikipedia.org/wiki/Royalty-free)
\ No newline at end of file