added kadira package
merged master in
Merge branch 'feature-kadira'