Some CS fixes.
Fixed a bug in DomainObject annotation.
Adde some more annotation tests.
Merge branch 'master' of github.com:1up-lab/OneupAclBundle