Merge commit '05db25ca2de4169ebcad6329c6b6984b2c8c7500'

* commit '05db25ca2de4169ebcad6329c6b6984b2c8c7500':
  Added Admin
Google Chart tests
Merge branch 'master' of https://github.com/EnriqueRE/project-sobek

# By Enrique Ramirez
# Via Enrique Ramirez
* 'master' of https://github.com/EnriqueRE/project-sobek:
  Added Valve Configuration Admin

Conflicts:
	Water_Automation/FieldApp/admin.py