Feature/attributeset

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Unit test passes: ?
Phpspec specification passes: yes
Checkstyle issues: no
ChangeLog updated: yes
Fixes the following issue: