Merge remote-tracking branch 'origin/master'

Conflicts:
	Branch.php
	Company.php
	Division.php
Merge remote-tracking branch 'origin/master'