Merge Derp

Change-Id: Ifa01b35c4d2c3b51e9e079f39c5e8d9ab7d1a544
Add check for sw600DP screens

This is used to show options based on screen size.

Change-Id: If99180517cb9e4a4729af11f57b7d4049c3cb10f
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>

Conflicts:
	src/com/aokp/romcontrol/fragments/Lockscreens.java
	src/com/aokp/romcontrol/fragments/StatusBarToggles.java