FragmentTransaction runs into exception (caused by unresolvable dependencies in preferences_general.xml).
Merge remote-tracking branch 'origin/preferences' into develop

Conflicts:
	res/xml/preferences_general.xml
Merge remote-tracking branch 'origin/preferences' into develop

Conflicts:
	res/xml/preferences_general.xml