Payment Integration Update
Merge branch 'master' of https://github.com/tegaphilip/myadverts

Conflicts:
	protected/controllers/paymentController.php
Payment Integration update