commit binary
set preview option aside for later
use android:fragment instead of nested pref screens to fix back stack bug
Merge remote-tracking branch 'durka/master' into preferences
Merge remote-tracking branch 'origin/preferences' into develop

Conflicts:
	src/org/durka/hallmonitor/DefaultActivity.java
Merge remote-tracking branch 'origin/framework' into develop

Conflicts:
	res/xml/preferences.xml
	src/org/durka/hallmonitor_framework_test/HMAppWidgetManager.java
	src/org/durka/hallmonitor_framework_test/PreferenceFragmentLoader.java