Adding proper label types (ZPL and PDF), proper reference numbers and instructions
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	lib/active_shipping/shipping/carriers/on_trac.rb
Merge remote-tracking branch 'refs/remotes/origin/master'
Fixing tests