refactor layouts and strings - more consistent naming
increase the axis value text size
move some Preferences code over to XML
use Listeners to handle preference clicks and changes
use Listeners to handle preference clicks and changes 2
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	build.gradle