Synched with Upstream
Balance of Cambell's js changes done (not yet in official repo)
http://frontaccounting.com/punbb/viewtopic.php?id=5330