Update category edit template so it can be used for create
Merge branch 'master' of github.com:poppiestar/onpatrol-cms

Conflicts:
	resources/categories.js