minor
Merge branch 'master' into vai

Conflicts:
	charge.php
redirect
small
Merge branch 'vai'
redirect to confirm.php