Payroll ,asset and expense is
Merge branch 'master' of https://github.com/salasarcore/Befit

Conflicts:
	admin/conn.php
	admin/pages.php
	js/dhtmlwindow.js
	js/modal.js