working concept needs further refinement
Merge branch 'master' of https://github.com/emoncms/development