add misc changes
Merge branch 'develop' of github.com:abdullahfahad/project-elite-local into develop