Merge branch 'dev' into tcuje
Merge branch 'dev' into tcuje
common package
common missed
new building, floor
bugfixes
merged dev into tcuje