watts solar water heater .dat reader
admin.py added water
.dat parser version 2. all new and shiny!
solar water scraper optomizations.
more little things
optomizations!!!
Merge remote-tracking branch 'max/solar_water' into app-restructure

Conflicts:
	server/webapp/settings.py
water/DummyScraper