Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'GL'
Merge branch 'master' into gh-pages
Merge branch 'GL'
add Q function
Merge branch 'GL'

convey userId into parenView Page
pass parameter test
pass parameter and view location test
delete file no longer in use
location test
location test 2
location test2
location
location
Add child feature almost done
fix merge conflicts
fix “/”
Give user child id
Merge branch 'master' of https://github.com/glzjuer/ChildrenTracker