update
update
merge wip
cleaned up things and fixed in page edit bugs
merge working
Merge branch 'sherpa-v0.8-jerry-wip' into sherpa-v0.8-bo-wip