Employments Diagram with totally funcionability
Merge branch 'bouch' into ardroz

To get the new structure in controllers