Merge pull request #234 from aptara/Sprint-5

Sprint 5
Error handling
added missing files
Merge branch 'Sushil' of https://github.com/aptara/AdvantexeAdminPortal into Sushil
e
Merge pull request #236 from aptara/Sushil

Sushil
Merge pull request #237 from aptara/Sprint-5

Sprint 5