blah
Merge branch 'master' of https://github.com/johnfonte/stredm-android

Conflicts:
	res/menu/main.xml