new file add and insert function

combine_payment
repair the coupon.php

for coupon usage
Merge branch 'master' of https://github.com/thuraucsy/onlineshop

Conflicts:
	fuel/app/config/development/db.php