merge
Merge branch 'kitkat' of https://github.com/soupy031/LiquidSmooth into kitkat

Conflicts:
	default.xml