add humanize
modified:   tour/settings.py
remove print
modified:   line/models.py
BUG FIX price display
modified:   line/templates/line/line.html
Merge branch 'master' of github.com:hungerr/tour

Conflicts:
	line/models.py