phptimeseries should return value
Update index.php
npoints should be $meta->npoints
Merge branch 'master' of https://github.com/emoncms/emoncms
Update index.php
Merge branch 'master' of https://github.com/emoncms/emoncms into organisations

Conflicts:
	index.php