SwipeBacklayout (2/2)
Port App SideBar from ChamelonOS (2/2)

Change-Id: I95d23f3b29641e9345bd60382ead9874f3a1b24b

Conflicts:
	AndroidManifest.xml
	res/values/attrs.xml
	res/values/strings.xml
	res/xml/preference_headers.xml

Conflicts:
	res/xml/preference_headers.xml
Show Carrier Name on Statusbar (2/2)

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

Conflicts:
	res/values/bk_strings.xml
Squash Battery Style from 4.2 project (2/2)
Cleanup
Notification Behavour (2/2)

Change-Id: I7ad22cabea9d0cfd04bd317fecb8d2cee7756d0c

Conflicts:
	res/values/strings.xml
	res/xml/prefs_ui.xml
	src/com/aokp/romcontrol/fragments/UserInterface.java

Conflicts:
	res/values/bk_strings.xml
	src/com/aokp/romcontrol/fragments/UserInterface.java
Update Low Battery Warning with Slim version (2/2)

Change-Id: Ia3181fe55cbcdc36506a4250dc7c7ab26157571b

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/prefs_ui.xml
	src/com/aokp/romcontrol/fragments/UserInterface.java

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

Conflicts:
	res/values/bk_arrays.xml
	res/values/bk_strings.xml
	src/com/aokp/romcontrol/fragments/UserInterface.java
Port Slim Date Format Option (2/2)

Change-Id: I6a1b3e09d905ae92b9500382c88a3d68bb54cf90

Conflicts:
	res/values/strings.xml
	src/com/aokp/romcontrol/fragments/StatusBarClock.java
ColorPickerPreference : add back missing function