updated
Merge branch 'newdev' of github.com:k-int/KBPlus into newdev
Merge branch 'edina' into newdev