Exception for "-" chars, buttons class "btn", show_order.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	airline/urls.py