fixing homepage route, building
troubleshooting water record display
dist conflist
Merge branch 'master' into water-graph-jc
Fixing water add process, did not have correct auth in the router