Start category edit controller ++
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/partials/category/edit.html
Start category edit controller ++