It was about time to move all that ConsumerIdentity stuff away
Merge branch '0.4.0' of github.com:hers-belgrade/hersdata into 0.4.0