my changes
Merge branch 'master' of https://github.com/abhinav-kr/CognitiveAssistanceOnGoogleGlass

Conflicts:
	gabriel-master/gabriel/control/mobile_server.py