Move correct_time_range and weekday? from LocationsHelper to Location
Use proc instead of Proc.new
Merge branch 'master' into new-backend

Conflicts:
	app/models/location.rb