Added edit name/delete dialog
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/SwitchHub/src/com/lopezgabriel/switchhub/MainActivity.java