Menu dynamically updates with options
Merge branch 'master' of https://github.com/davelkan/whisperspot

Conflicts:
	app/src/main/res/values/strings.xml