Hotfixing again
Merge pull request #162 from zefciu/hotfix-licence-2

Hotfixing again
Merge branch 'develop' into feature/change-field-type-of-height-of-device
Fix migrations