Update
Merge branch 'master' of https://github.com/JKetelaar/PriceGrabber

Conflicts:
	src/org/pricegrabber/Boot.java