admin
Merge branch 'master' of https://github.com/dtsoftweb224/systempay

Conflicts:
	sql/client.sql