cookiemanger chanches
Merge branch 'master' of github.com:domi1819/CookieClicker

Conflicts:
	cookieclicker/src/ch/jmnetwork/cookieclicker/CookieClickerMain.java