demo
Merge remote-tracking branch 'origin/demo' into demo

Conflicts:
	app/themes/AdminLTE-master/backand/partials/grids/grids.html