removed kadira config from git
Merge branch 'hotfix/0.5.4'
Merge tag '0.5.4' into develop