Misc changes
Merge branch 'master' of https://github.com/tahirimran/popcliqs-web-app