- Added basic menu in Settings
Merge branch 'master' of https://github.com/StormFalcon/MicPhone

Conflicts:
	res/values/strings.xml

- Resolved conflict from Yong Jie’s trigger server state commit