Merge pull request #1156 from vinaysingu/updatespecs

Specs Updated
updated shipvia privileges
Merge branch 'master' into updatespecs
added new test for ship zone