changed category delegate
Merge branch 'refs/heads/master' into catcolor