Merge Changes
Revert "Merge Changes"

This reverts commit 15d1ee1ea2afc3139c17edd4f895349f7a84ef6d.
Merge branch 'master' of https://github.com/chankan/SmartKanteen
Merge branch 'master' of https://github.com/chankan/SmartKanteen
Updated Error handling part for Rest Service as well as Taken care of
Return Types