Squashed commit of the following:

commit 482e6069b9368fb3dfe71c89f064264d450bc3d3
Merge: 32bfcc3 808d6ca
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Wed Feb 5 11:54:37 2014 -0800

    Merge branch 'master' into front_dev_srvr_issue.MLHR-730

commit 32bfcc381bc601772d929ad6ea8ca86d219171a2
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Wed Feb 5 11:53:41 2014 -0800

    MLHR-730 #resolved #comment escaping double-quotes
Merge pull request #688 from andyperlitch/MLHR-730

Escaped double-quotes in dev server error message