Bug 841525 - Highlight of Selected Folder
Bug 847436 - [BB][buttons] - Center Drop Down Select Text
Bug 847478 - [BB][input_areas] - Input text should be aligned with header
Bug 816260 - Hotspot Settings: No error message is displayed when Wi-Fi hotspot SSID is blank r='kaze'

An error Alert message is displayed in case of empty SSID and the fields are reverted to previous settings.
Bug 820365 - remove ringtones under apps/clock/style/ringtones folder
Bug 854292 - Add more safegaurds for headers being deleted while they have pending operations r=asuth
Bug 828278 - Discard the permission request when home button is pressed
Merge pull request #8759 from alivedise/bugzilla/828278/discard-permission-when-home-button-pressed

Bug 828278 - Discard the permission request when home button is pressed, r=etienne
Bug 851684 - [B2G][Contacts][Settings]: Cannot update the contacts label, the update button is grayed out [r=jmcf]
Bug 815653 - [Settings] - remove :active for explanation items

Conflicts:
	apps/settings/style/lists.css
Bug 816067 - Change FTU backgrounds
Bug 823414 - B2G browser gradient value does not match the gradient found in Settings
[STK] On hideInput field we show the INPUT area as a password field
Bug 828908 - [Settings] Hints should not be treated as list items

Conflicts:
	apps/settings/index.html
Bug 830111 - [Settings] - arrange Phone lock screen
Bug 834446 - [Browser] Truncated Bookmark Label

Conflicts:
	apps/browser/style/browser.css
Bug 822585 - Change hand image
Bug 827804 - [Lockscreen UX] Entering passcode. "Emergency call" and "Cancel" buttons should be vertically centered
Bug 823793 - [B2G][Browser]: Long site names and addresses in the Top Sites/Bookmark/History tabs do not have their text truncated gracefully
Bug 829023 - [Settings] Don't use dividers to separate paragraphs in the same text block

Conflicts:
	apps/settings/index.html