for merging
Merge branch 'master' of github.com:zwade/hack2014

Conflicts:
	src/me/zwad3/mosaic/widget/RandomPictureWidget.java