bugs from multivolunteer additions
Merge pull request #7 from zedoyle/master

Regionally-controlled scales, unit conversion
remove rubymine stuff from repo
Fix bugs on live server
Some clean-up of issues from last pull
A bunch of changes to allow multiple volunteers per log (as with schedule)
Fixes to Zach's migration & unit conversion
Fixing issues with scale types and migrations
working on multiple volunteers per log
Merge branch 'master' of https://github.com/somerandomsequence/food-rescue-robot

Conflicts:
	Makefile
Merge branch 'master' of https://github.com/somerandomsequence/food-rescue-robot
Ignore blank entries
login page fixes
problems with HUD
Merge branch 'master' of https://github.com/somerandomsequence/food-rescue-robot
small fix
fix region stats issues
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/migrate/20140207200738_create_scale_types.rb