Don't include gateway files on setGateway function
Merge remote-tracking branch 'upstream/v2.0' into v2.0
Merge remote-tracking branch 'upstream/v2.0' into v2.0

Conflicts:
	classes/class.memberorder.php
Merge branch 'tubiz-v2.0' into v2.0