Modified build.gradle to include latest play version
play services edit

play services edit
to be reverted

to be reverted
Revert "to be reverted"

This reverts commit 45661870b5af71c4c33337d27867bd8a63850150.
Revert "play services edit"

This reverts commit 15e9d082e885264c12b361e98ffc09237000bcca.
Revert "Modified build.gradle to include latest play version"

This reverts commit bde507c6064da3638eea6ab35009c822761fa80f.
Merge branch 'priyan'
Merge branch 'master' into priyan
Fixed the Wifi Checkbox bug
Added new drawable resource
Minor Edits
Added Contextual Action Bar in the Add Environment Menu
Added Done button and Cancel button on click listener
Added Dialog based guidance to add environment.
Now the add environment is auto explanatory by the help of dialogs
Created the environment - adding the environment to the database remains
Created the environment - adding the environment to the database remains
Minor Changes
Merge branch 'master' into priyan
Added Location Selection via Google MAPs
Added Permission: Internet, Write_Disk
Uses Google Map API_V2
Minor Changes
Merge branch 'aravind' into priyan

Conflicts:
	.idea/libraries/play_services_5_2_08.xml
	app/src/main/AndroidManifest.xml
Minor Changes