Designer refactoring
Merge branch 'dev' of http://github.com/emoncms/emoncms.git into beforemoduleclass
Merge branch 'master' of http://github.com/emoncms/emoncms.git into beforemoduleclass
Some locale improvements
Merge remote-tracking branch 'origin/beforemoduleclass' into dev