Merge pull request #362 from einhverfr/master

Fixing bug 817, adding physical and mailing addresses for employees
Merge pull request #363 from einhverfr/master

fixing issue with demo_with_images template
Merge pull request #367 from einhverfr/master

Fixing error preventing order deletion
Merge pull request #369 from einhverfr/master

Fixing bug 1223, incorrect handling of prices from parts search
Merge pull request #371 from einhverfr/master

Fixing issue reported by Max, cannot log in after saving/approving batch
Merge pull request #374 from einhverfr/master

Fixing account dropdowns and silencing one warning
Merge pull request #377 from einhverfr/master

Updating changelog to include missing fix
Merge pull request #380 from einhverfr/master

rpm spec changes to use packaged dojo
Merge pull request #381 from einhverfr/master

Error handling for psql not found
Merge pull request #383 from einhverfr/master

Changelog update and sql fix for 1228
Merge pull request #387 from einhverfr/master

Fixing pricematrix vendor price handling
Merge pull request #389 from einhverfr/master

Bill's additions to the INSTALL file
Merge pull request #392 from einhverfr/master

added sysconfig tests
Merge pull request #394 from einhverfr/master

Fixing sales tax bug Bill A reported.
Merge pull request #396 from einhverfr/master

Plack and Starman
Merge pull request #398 from einhverfr/master

Bill's updated documentation
Merge pull request #400 from einhverfr/master

Better plack docs and makefile adjustments
Merge pull request #402 from einhverfr/master

Duplicate user handling in setup.pl
Merge pull request #403 from einhverfr/master

Renaming buttons for approval process
Merge pull request #407 from einhverfr/master

Trying to fix failure for travisci when publishing test coverage