Merge branch 'master' of https://github.com/obama/gaia

Conflicts:
	apps/bluetooth/js/deviceList.js
	apps/bluetooth/test/unit/_transfer.html
	apps/bluetooth/transfer.html
	apps/browser/js/nfc.js
	apps/callscreen/index.html
	apps/camera/js/lib/camera/camera.js
	apps/camera/js/views/viewfinder.js
	apps/camera/style/app.css
	apps/camera/style/controls.css
	apps/camera/style/focus-ring.css
	apps/camera/style/hud.css
	apps/camera/style/recording-timer.css
	apps/camera/style/timer.css
	apps/camera/style/viewfinder.css
	apps/camera/test/unit/lib/camera/camera_test.js
	apps/clock/index.html
	apps/clock/js/app.js
	apps/clock/js/panels/alarm_edit/main.js
	apps/clock/js/panels/alarm_edit/panel.html
	apps/clock/style/alarm.css
	apps/collection/build/build.js
	apps/collection/js/view_collection.js
	apps/collection/style/css/view.css
	apps/collection/view.html
	apps/communications/contacts/js/nfc.js
	apps/communications/contacts/test/unit/nfc_test.js
	apps/communications/dialer/locales/dialer.en-US.properties
	apps/costcontrol/fte.html
	apps/costcontrol/index.html
	apps/costcontrol/js/settings/limitdialog.js
	apps/costcontrol/js/settings/settings.js
	apps/costcontrol/settings.html
	apps/costcontrol/style/app.css
	apps/costcontrol/style/views/firsttime.css
	apps/costcontrol/test/unit/settings_test.js
	apps/email/style/common.css
	apps/fl/style/pick.css
	apps/ftu/index.html
	apps/ftu/js/ui.js
	apps/ftu/style/style.css
	apps/ftu/test/unit/mock_navigation_index.html
	apps/ftu/test/unit/wifi_test.js
	apps/gallery/js/gallery.js
	apps/keyboard/js/settings/settings.js
	apps/keyboard/settings.html
	apps/music/js/music.js
	apps/music/test/marionette/lib/music.js
	apps/search/js/providers/places.js
	apps/settings/elements/about.html
	apps/settings/elements/about_more_info.html
	apps/settings/js/modules/date_time.js
	apps/settings/locales/settings.en-US.properties
	apps/settings/test/marionette/app/keyboard_app.js
	apps/sms/index.html
	apps/sms/js/action_menu.js
	apps/sms/js/information.js
	apps/sms/js/message_manager.js
	apps/sms/js/thread_list_ui.js
	apps/sms/js/thread_ui.js
	apps/sms/locales/sms.en-US.properties
	apps/sms/style/sms.css
	apps/sms/test/unit/activity_handler_test.js
	apps/sms/test/unit/information_test.js
	apps/sms/test/unit/message_manager_test.js
	apps/sms/test/unit/sms_test.js
	apps/sms/test/unit/thread_list_ui_test.js
	apps/sms/test/unit/thread_ui_test.js
	apps/system/index.html
	apps/system/js/accessibility.js
	apps/system/js/app_chrome.js
	apps/system/js/lockscreen.js
	apps/system/js/media_recording.js
	apps/system/js/nfc_handler.js
	apps/system/js/notifications.js
	apps/system/js/statusbar.js
	apps/system/locales/system.en-US.properties
	apps/system/style/chrome/chrome.css
	apps/system/style/chrome/images/menu_add_to_homescreen.png
	apps/system/style/chrome/images/menu_add_to_homescreen@1.5x.png
	apps/system/style/chrome/images/menu_share.png
	apps/system/style/chrome/images/menu_share@1.5x.png
	apps/system/style/chrome/images/menu_share@2.25x.png
	apps/system/style/chrome/images/menu_share@2x.png
	apps/system/test/marionette/lib/system.js
	apps/system/test/unit/app_chrome_test.js
	apps/system/test/unit/lockscreen_test.js
	apps/system/test/unit/mock_screen_manager.js
	apps/system/test/unit/nfc_handler_test.js
	apps/system/test/unit/notifications_test.js
	apps/system/test/unit/statusbar_test.js
	apps/verticalhome/index.html
	apps/verticalhome/js/app.js
	apps/verticalhome/style/css/app.css
	apps/verticalhome/test/marionette/lib/home2.js
	apps/video/index.html
	apps/video/js/video.js
	apps/video/js/view.js
	apps/video/style/video.css
	apps/video/style/video_tablet.css
	apps/video/view.html
	apps/wallpaper/js/pick.js
	apps/wallpaper/pick.html
	apps/wallpaper/share.html
	apps/wappush/index.html
	apps/wappush/js/wappush.js
	apps/wappush/style/wappush.css
	build/csslint/xfail.list
	build/homescreen-manager.js
	build/jshint/README.md
	build/settings.js
	shared/bower.json
	shared/elements/gaia-theme/.bower.json
	shared/elements/gaia-theme/bower.json
	shared/elements/gaia-theme/style.css
	shared/elements/gaia_buttons/style.css
	shared/elements/gaia_confirm/style.css
	shared/elements/gaia_subheader/style.css
	shared/js/tz_select.js
	shared/test/unit/mocks/mock_notification.js
	tests/atoms/gaia_data_layer.js
	tests/python/gaia-ui-tests/gaiatest/tests/accessibility/system/test_a11y_volume_buttons_panel_visibility.py
	tests/reporters/basemozperf.js