Blis updates
Updated git files
Merge branch 'master' of github.com:I-TECH/KenyaLIS

Conflicts:
	htdocs/ajax/search_p_dyn.php
	htdocs/includes/db_constants.php
	htdocs/includes/db_lib.php
	htdocs/includes/page_elems.php
	htdocs/reports/reports_billing.php
Merge pull request #4 from norbertglen/master

Updated blis files for merging