Changes made on 26 Oct 2014
Merge remote-tracking branch 'origin/master'
Changes made on 27 Oct 2014
Changes made on 28 Oct 2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	Branch.php
	Company.php
	Division.php