implementing tabs
conclude merge
added log tab
made LED calibration actually work
Merge branch 'master' of github.com:jtrovato/starfish-avocado

Conflicts:
	android_app2/res/values/strings.xml