Bug 1062730 - [NFC] Home button could not work well after receiving multiple websites which are shared via NFC
1. publish activeappchanged when app is changed in app_window_manager.js
2. stop tiltiing effect if receiving activeappchanged event
Bug 1066015 - [Camera] black screen when press power key as soon as you open a camera app
Bug 1066339 - Use CSS variables for statusbar height r=alive
Bug 1068659 - Resizing no-data icon
Bug 1071064 - [Contacts] [ICE Settings] Even if Select ICE Contact button is disabled it can be clicked

Conflicts:
	apps/communications/contacts/test/marionette/ice_test.js
Bug 1070895 - Pressing ENTER in search box clears search and returns back to inbox
Bug 1061440 - Provide an option for restoring only apn items instead of the entire apn settings

Conflicts:
	apps/settings/js/modules/apn/apn_settings_manager.js
Bug 1071064 - Add assert require to ice_test.js. a=bustage
Resolving conflicts
updating localization to the new requirements

Conflicts:
	dev_apps/privacy-panel/index.html
fixing Thomas's report
fixing merge conflicts

Conflicts:
	dev_apps/privacy-panel/templates/guided_tour/la_blur.html
	dev_apps/privacy-panel/templates/guided_tour/la_custom.html
	dev_apps/privacy-panel/templates/guided_tour/la_exceptions.html
	dev_apps/privacy-panel/templates/guided_tour/la_explain.html
	dev_apps/privacy-panel/templates/guided_tour/rpp_explain.html
	dev_apps/privacy-panel/templates/guided_tour/rpp_locate.html
	dev_apps/privacy-panel/templates/guided_tour/rpp_lock.html
	dev_apps/privacy-panel/templates/guided_tour/rpp_passphrase.html
	dev_apps/privacy-panel/templates/guided_tour/rpp_ring.html
	dev_apps/privacy-panel/templates/guided_tour/welcome.html
fix the remote pp dissapearence

Conflicts:
	dev_apps/privacy-panel/js/remote_privacy_protection.js
fix what was accidentally removed
Ading localization files that got lost
Fixing ALA explain in GT
Add actual blur status for exception applications list
Fix Custom Location
JShint all js files
Change 'manifestUrl' into 'origin'
Change min password length