Fix build

Conflicts:

	src/com/aokp/romcontrol/fragments/UserInterface.java