Added compatibility with Money 6.x.
Merge branch 'money-7.x' of https://github.com/dblock/money_helper into dblock-money-6.x

Conflicts:
	lib/money_helper.rb