Added CategoryAttribute to properties of actions and behaviors

Added CategoryAttribute to properties of actions and behaviors.
Now everything is OK, you should not have any problems with merge.