Add some default folder names

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

Change-Id: I69fe7bde3e8247ce574ddbbeba942344c761842a
Merge remote-tracking branch 'upstream/cm-10.2' into HEAD