Merge pull request #72 from spedepekka/devel

TC-449 Add Calabash entities
Version update