Bug 1042920 - Allow gaiatest testvars to overwrite default settings
Bug 960126 - Re-enable Notification.get tests
Bug 928012 - Contacts should use generic 'memory card' instead of SD
Bug 972210 - (Part I) Stop exposing inputContext to IMEs
Bug 1033549: [CostControl] Add a per-app data usage list. r=salva
Bug 1048792 - Don't autocorrect if first suggestion has different length (counting alpha chars) than input
bug1056857-Part 1: added developer checkbox for ignoring GPS. r=ehung

This is just the GUI side, the other parts of this bug are implementation of this.
Bug 1060208 - [Settings] patch new panels with gaia-headers
Bug 1032008 - Fix jshint error for build/jshint/xfail.js
Bug 1035250 - Add incremental statusbar icons in FTU
Bug 1059668 - Move some keyboard removal logics from keyboard_manager.js to input_frame_manager.js
Bug 1059234 - Import sim contacts message not displayed on FTU after importing contacts
Bug 1058547 - Amount about balance is cut
Bug 1058545 - Incorrect visual screen in "Enter the top-up code"
Bug 1060294 - [bluetooth] Update new settings.html with gaia-header
Bug 1032023 - Fix jshint error for build/pre-app.js

Conflicts:
	.jshintignore
Bug 1060385 - [shared/pages/import] Implement gaia-header
Bug 1042584 - [Contacts][ICE] Select the contact from the list r=sergi
Bug 1054716 - Prevent system notification banners from overlaying the software home button
Bug 1060462 - Avert race condition in gaiatest when interacting with language select menu in Settings app r=qdot