Modifying forms
Merge branch 'master' of github.com:homeretailgroup/com.argos.hackathon.teamSix

Conflicts:
	web/app/views/addChild.html