Merge branch 'lingjun'
Removed Carousal on Home
News
Merge branch 'lingjun'

Conflicts:
	tpl/TaskView.html
Merge
Merge branch 'master' into lingjun