Client portal
Merge branch 'master' into develop

Conflicts:
	agreement/index.html
	client/pay/charge.php
	client/pay/index.php
	css/main.css