Changed makefile to use development branch
Fixed ding_entity_id lenght (256 -> 255), so it do not break installation profile
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release