Update Category & Category management
Merge remote-tracking branch 'origin/master'

Conflicts:
	category.php
	category_management.php