Conflicts:
	lib/tasks/order_details.rake
Merge branch 'master' into upgrades