Add some default folder names

Change-Id: I7a1cc58f225708bdc9eeb8354d96a4b834fcb781
Support for adding live folders in the default workspace

Change-Id: I69fe7bde3e8247ce574ddbbeba942344c761842a
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_packages_apps_Trebuchet into cm-10.2

Conflicts:
	res/values/cm_strings.xml

Change-Id: I0b707380c77957e91a4b2c47522401191242cecc