#78 only 3 buttons left
Merge branch 'master' of https://github.com/bradshoow/SARA.git

Conflicts:
	res/values-en/strings.xml