hm

Change-Id: I814521d87fecebf9f99ed57d335f37681cf5fced
Merge branch 'ck44' of https://github.com/errantzebra845/slim_candykat into ck44

Conflicts:
	default.xml

Change-Id: I60cdf80924969418b9aafbc83ad9df987dd339f9