bug fixes
Merge branch 'master' of https://github.com/saurabh6790/tru_app_back
Conflict Fixes