Updated the project for CB 1.5-R0.1
Merge remote-tracking branch 'origin/master'