pagebase -> pagebased
singledesktop -> ajaxbased
Merge branch 'chapter9' into chapter10