added support for pulling discount code out of price data.
Merge branch 'master' into dev

Conflicts:
	lib/onix_parser/parser2long.rb