emoncms.org version of emoncms with timestore conversion ui
Create timestore feed, db fields for conversion
Merge branch 'master' of https://github.com/emoncms/emoncms into emoncmsorg

Conflicts:
	Modules/feed/feed_model.php
include entry for timestore adminkey
Implementation of delete feed for timestore
Timestore export functions
Function to return timestore feed meta data: start time, interval, npoints
Function to return timestore feed metadata: start, interval, npoints
Timestore feed export implementation
Update readme.md
Update readme.md
full range of interval options
Merge branch 'emoncmsorg' of https://github.com/emoncms/emoncms into emoncmsorg
Interval selector is only shown when creating a realtime (timestore based) feed + other refactoring work
Interval selector is only shown when creating a realtime (timestore based) feed + other refactoring work
Merge pull request #1 from emoncms/emoncmsorg

Add in timestore pieces