Merge branch 'master' of https://github.com/justinwm/SE-Payment

Conflicts:
	Lib/Action/OrderAction.class.php
Merge branch 'master' of https://github.com/justinwm/SE-Payment
Merge branch 'master' of https://github.com/justinwm/SE-Payment

Conflicts:
	Lib/Action/OrderAction.class.php