Changed Index page to graph consolidated sensor and valves, added a GPRSs page, deleted Area page, Changed Valves to consolidated one.
Conflict with models resolved
changed Agg to Log on Valve
Conflicts with index solved

Conflicts:
Water_Automation/FieldApp/models.py
Water_Automation/FieldApp/templates/index.html
Water_Automation/FieldApp/templates/nav.html
Water_Automation/FieldApp/templates/valve.html
Water_Automation/Water_Automation/urls.py
Commits resolved...again...
Conflict url.py
Merge branch 'master' of https://github.com/cita-moviles/project-sobek into Tests
changed name of view on Farm_Field_Log_Serializer