by zhanyi
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	src/plugins/imageslider.js
by zhanyi