Master v4

Added logic for alchemy labs, shipment and portal upgrades
Merge branch 'master' of https://github.com/jrabidea/Cookie-Clicker

Conflicts:
	src/CookieClicker.java
	src/CookieClickerAddresses.java