Merge branch 'master' of https://github.com/devpointlabs/SolarU

Conflicts:
	db/schema.rb
fixes monthly data
add a counter to track money saved