Commited fix to issue #1639 (http://ocportal.com/tracker/view.php?id=1639). [Error after clicking button to return from shopping cart purchase]
Commited fix to issue #1641 (http://ocportal.com/tracker/view.php?id=1641). [Context-specific Wiki+ page titles not working correctly]
Misc fixes
Updated Code Quality Checker to more recent Java version, tidied code up a bit