updated graph
updated graph
Merge branch 'weatherblur' of github.com:NBTSolutions/Elgg into weatherblur
new infor for obs list
resolve merge conflict from scotts changes
Merge branch 'weatherblur' of github.com:NBTSolutions/Elgg into weatherblur