Temperatures fixed.
Merge branch 'master' of https://github.com/mweisz/InnoJam-Farmville

Conflicts:
	WebApp/data.js