merging to cm-10.1, not ready for prime time, initial commit.

Signed-off-by: JamieD81 <jamied81@gmail.com>