update server,js for data getting
Updated water icon design file, css, map.js
Merge branch 'master' of ssh://www-watertransfer.rhcloud.com/~/git/www
tweaking data download scripts
merged javascripts
Updated water rights panel data