Fix quoting in confset of FANNIE_NAV_POSITION
Resolve conflict from merged version

At line 799, resolved:
<<<<<<< HEAD
$obj->normalize($argv[2],BasicModel::NORMALIZE_MODE_APPLY, True);
=======
$obj->normalize($argv[2],BasicModel::NORMALIZE_MODE_APPLY);
>>>>>>> flathat/master
keeping HEAD.
BUGFIX: Dispatch wasn't gating output properly. Normalize function
signature wasn't correct in view models.
Merge remote-tracking branch 'origin/master'
parse port in ADODB Connect()

I'm reluctant to change things at this level, but there isn't a way
to supply port separately via SQLManager and real_connect() will
not work if it is embedded in $host.

$this-port is defined in the driver and may not always exist.

Port is needed where accessing mysql via ssh tunnel.
BUGFIX: Dispatch attempt #2 using backtrace to determine where it's called
WEFC_Toronto fixes from pull 10Oct13

A variety of problems and some tweaks discovered upon testing
the programs we used most after pulling from upstream.
Support host:port format with MySQL PDO driver
Stray newline (causes problems with FPDF; the line creates pre-header
output)
Merge branch 'master' of https://github.com/CORE-POS/IS4C