x
Merge remote-tracking branch 'origin/dev'

Conflicts:
	htdocs/assets/codekit-config.json
x
x
x
fixed bug: in script run on marshall page load to update the counts in sidebar causing apache error logs to fill with unnecessary errors
x
feature update: added a module to convert sql database query results to human & machine readable csv output
x
fixed bug: in downloading light curve csvs
x