改变dom结构，增加 ng-include - by jarrick
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/controllers/dashboard.js
改变dom结构，增加 ng-include - by jarrick