Merge branch 'master' of https://github.com/Bioreactor/Code-Bioreactor

Conflicts:
	CouchDB/logDisplay/views/minuteAverage/reduce.js