register actions in categories automaticly
fixing TODOs
convert the UUID String correctly
Merge branch 'origin/master'