Some changes
Merge branch 'master' of https://github.com/metal-remco/arij

Conflicts:
	cms/database/sql.php
	cms/management.php
	cms/views/insertpayment.php