Trebuchet : Make regular folders persistent

Fix incorrect if condition, so only live folder's contents
are not persisted.

Change-Id: Ide9123feb0d13cc58aaa0679710b7a285b2e30e7
Trebuchet : Support for custom icons per shortcut

Allows user to assign custom icons from icon packs to individual
homescreen shortcuts.

Change-Id: I6613b5f3e6517485a6f83aa5f6769e22bb7f18dc
Merge pull request #2 from PAC-man/cm-10.2

Cm 10.2