Committing changes done in Administration , Payroll  , Asset  and Expense Modules
Merge branch 'master' of https://github.com/salasarcore/Befit

Conflicts:
	admin/conn.php
	admin/news_list.php
	admin/notice_list.php
	admin/pages.php
	admin/php/header.php
	admin/popups/notice.php