working code base example for the current cq5 book
fixed merge conflicts