Fix CM TabletUI patching for builds after april 3, 2013.
Merge branch 'master' of https://github.com/mateor/auto-patcher
Add a CONFLICTS for tabletUI and add Caldair as DEV

* Added Caldair as a DEV for the tabletUI mod

* Now conflicts for 4.2 for (aosp, evervolv, slim and aokp). Basically everything but CM.
This is also the first instance of filtering the CONFLICTS by ANDR version. So the conflicts
ill change depending on what Android version they have. Hopefully we will see no issues
from that. In my limited testing, it went okay.