Renderin
Merge branch 'master' of https://github.com/ebuyukcan/WiserWater

Conflicts:
	djangoproject/static/js/main.coffee
	djangoproject/static/js/main.js