start adding dates to Editor
Merge branch 'master' into dates

Conflicts:
	public/js/angular/controllers.js
move category watch inside promise
Merge branch 'master' into dates
fix status loading
fix status loading
Merge branch 'dates'

Conflicts:
	public/js/angular/controllers.js
add tabs to dashboard editor