15.3
15.4
1
1
add gallery swfupload
del lib swfupload
123
Merge branch 'master' into 2.1.0

Conflicts:
	assets/less/reset.less
	assets/script/config.js
	assets/script/sea-modules/eagle/charcount/1.0.0/src/charcount.js
	eagle_charcount.html