Merge pull request #1 from makerspace/master

Fixing errors with property lists
Added feedback for chiller flow
Merge branch 'master' of https://github.com/DevJohan/LasaurApp
Merge branch 'master' of https://github.com/makerspace/LasaurApp

Conflicts:
	frontend/js/app.js
Merge pull request #2 from DevJohan/master

Added chiller flow and temperature warnings