testing IPN handling
Merge branch 'master' of github.com:sighmon/NI

Conflicts:
	app/models/payment_notification.rb