update...
Merge branch 'master' of https://github.com/jxieeducation/R24

Conflicts:
	public/default.html