make the images button visible
Bump version for pushed changes.
Merge branch 'master' into picker

Conflicts:
	war/WEB-INF/appengine-web.xml
Picker work
Do some clean-up
?
get things to build
use the linode cloud, now that AWS is deprecated
Merge pull request #9 from jakemwood/picker

Image Picker - (also brings the picker branch up to date with master)
Merge pull request #10 from bootstrapworld/picker

Turn on the Image Picker (Thanks, Jake Wood!)