// setup settings menu
Merge branch 'master' of https://github.com/nlittlepoole/Alfred

Conflicts:
	AndroidManifest.xml