merge changes from remotes/github/cm-10.1 into master

Conflicts:
res/layout/installed_app_details.xml
res/values/cm_strings.xml
src/com/android/settings/applications/InstalledAppDetails.java
src/com/android/settings/profiles/BluetoothTriggerPreference.java
src/com/android/settings/profiles/ProfileConfig.java
src/com/android/settings/profiles/TriggersFragment.java
src/com/android/settings/profiles/WifiTriggerAPPreference.java

Change-Id: I3ab04d542f3ddcdeb561ca3763b2d8e94d1cbd22