Bugs fixed
Merge branch 'master' of https://github.com/sgovindarao/airforce-dev

Merge by Kunal
Changes by Kunal