update edit category
update edit category
Merge origin/master

Conflicts:
	database.sql