s

s
Merge branch 'master' of https://github.com/leitingcm/dashboard

Conflicts:
	config/slidebarcfg.js