changes to ch_basics

changed from icehouse and juno to kilo
corrected versions

Change-Id: I0e988da23cee6209197ff2924dd8d477f29d63d9
Merge "changes to ch_basics"