Merge branch 'master' of https://github.com/itamaro/higgs-bot

Conflicts:
	Android/RoboDroid/res/values/strings.xml
update the network op to a service. update menu icon. tested with my pc
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android/RoboDroid/res/values/strings.xml
Merge branch 'master' of https://github.com/itamaro/higgs-bot