Fixed upgrades still having color boxes even when it is off in preferences (Issue #21) and fixed graphical glitch with timer bars on a cookie chain
Version change
Merge branch 'master' into dev

Conflicts:
	CookieMonster.js
	src/Main.js