new changes
Merge branch 'master' of https://github.com/hzahoori/Tarboz into Tarboz_w8

Conflicts:
	classes/DataAccessorsTier/DBHelper.php
	config.php
	views/shared/header.php