From Work lapptop
From Work lapptop
Merge branch 'master' of https://github.com/DanieDuToit/BusinessEntity
Removed FunctionTests
TFS changes
Changes made on 20 Oct 2014
Changes made on 20 Oct 2014
Changes made on 20 Oct 2014
Changes made on 20 Oct 2014
Changes made on 21 Oct 2014
Changes made on 21 Oct 2014
Changes made on 22 Oct 2014
Changes made on 22 Oct 2014
Changes made on 22 Oct 2014
Changes made on 22 Oct 2014
Changes made on 23 Oct 2014
Changes made on 24 Oct 2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/sqldialects.xml
	BaseClasses/BaseBranch.class.php
	BaseClasses/BaseCompany.class.php
	BaseClasses/functions.inc.php
	Branch.php
	BranchAction.php
	BranchDisplayGrid.php
	BusinessLevelDisplayGrid.php
	Company.php
	CompanyDisplayGrid.php
	Default.php
	Division.php
	DivisionAction.php
	DivisionDisplayGrid.php
	Header.inc.php
Changes made on 24 Oct 2014