Commited fix to issue #1679 (http://ocportal.com/tracker/view.php?id=1679). [Bug editing templates in a custom theme, if was previously edited in the default theme]
Misc fixes / tuning
Calendar fixes