Some error messages changes
Merge pull request #261 from aptara/Gauri

Some error messages changes
Fixed the zip issue
Merge pull request #263 from aptara/Sushil

Fixed the zip issue
Merge pull request #262 from aptara/Sprint-5

Sprint 5
Merge pull request #264 from aptara/master

Merge from master