Protected Folder Fragment: Add remove Shortcut from list.

Change-Id: I0e9f141bc34bcfa955d7f5f3535d9d437e94b1da
Customizeable Dynamic Grid:

 - Presets
   - Comfortable (+0)
   - Cozy (+1)
   - Condensed (+2)
 - Custom option with min, max

Reordering items in the settings pane for better organization
Modifying Settings Layout for readability

Change-Id: I5c926b6ca4b2ed73c263ef34eeb368caeb7af9b5
Merge "Customizeable Dynamic Grid:" into cm-11.0
Merge "Protected Folder Fragment: Add remove Shortcut from list." into cm-11.0
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	res/values/cm_strings.xml

Change-Id: I1a8fc841121124eb7be12ebb18bf5293b4edeb94