Updates for frontend
Merge branch 'master' of github.com:homeretailgroup/com.argos.hackathon.teamSix