Payment page
Small logic changes in redirect
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/store.php