Fix bug where interface is unresponsive because of error
Merge branch 'master' of https://github.com/emoncms/emoncms
Merge branch 'master' of https://github.com/emoncms/emoncms into organisations