Merge branch 'master' of https://github.com/SLASSCOM/slasscom-web-frontend-developer

Author: hasith