Merge pull request #425 from timschofield/develop

Begin the work of moving all branding information to a separate file
Consolidate SQL, and add in saleman only login checks
Thumb: Fixed the bug in ConfimDispatch_Invoice.php for Balance quantitycanceled policy by line no instead of by stockid
Merge pull request #426 from fahadhatib/develop

Develop