merge cm-16 to dev_1.0

Fixed the screens (buttons can now be seen)