添加tablesorter和取出semantic的gem
添加bootstrap包
添加nprogress实现加载进度条
Merge branch 'cjw' into dev

Conflicts:
	app/assets/javascripts/admin.js