Merge pull request #196 from einhverfr/master

Merging fix for log messages
Merge pull request #199 from einhverfr/master

merging shipto fix from 1.3
Merge pull request #202 from einhverfr/master

fixing shipto's not being autochecked
Merge pull request #205 from einhverfr/master

Reworking fix from 1.3
Merge pull request #209 from einhverfr/master

fixing errors in assembly refactor
Merge pull request #211 from einhverfr/master

Adding additional perms to Roles.sql, adding additional dependency to Ma...
Merge pull request #212 from einhverfr/master

silencing logs
Merge pull request #214 from einhverfr/master

Fixing bug 1131
Merge pull request #218 from einhverfr/master

Fixing bug 1132, removing Save Location button if no location to overwri...
Merge pull request #48 from ledgersmb/master

up to date