Updates
Merge branch 'master' of github.com:homeretailgroup/com.argos.hackathon.teamSix
Adding parent linking
Merge branch 'master' of github.com:homeretailgroup/com.argos.hackathon.teamSix