[task] added and refactored Builder header to User and Group
Merge pull request #86 from davidmoebius/builder_header

[task] added and refactored Builder header to User and Group