fix nil description bug
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit

Conflicts:
	app/models/location.rb