Bug 1042920 - Allow gaiatest testvars to overwrite default settings
Bug 960126 - Re-enable Notification.get tests
Bug 972210 - (Part I) Stop exposing inputContext to IMEs
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 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 1032023 - Fix jshint error for build/pre-app.js

Conflicts:
	.jshintignore
Bug 1060500 - [camera]  on startup
Bug 1038698 - only start running system a11y visibility tests when the logo is completely hidden.
Bug 1060542 - [Calendar] Week view: changing the date should also set the selected day on month view
Bug 1060801 - Rename "Cancelled" to "Canceled" in call info view. r=Rik
Bug 990047 - Add a shared function to load JSON files and use it throughout gaia to replace the existing ad-hoc functions
Bug 1032001 - Fix jshint error for build/copy-build-stage-data.js
Bug 1060879 - Make the first keyboard key audiable
Bug 1058707 - Add launch task manager button to Browser overflow menu
Bug 1043177 - Redesign Contact edit page