Bug 1069200 - [Camera]Rapidly click take button and switch picture/video mode will cause video recording and picture mode in the same time
Bug 1071676 - [Travis] Run tests on v2.1 branch too r=me
Merge pull request #24350 from julienw/1071676-v2.1-run-tests

Bug 1071676 - [Travis] Run tests on v2.1 branch too r=me
Bug 1058900 - [email] Workaround graphics corruption / memory spikes by cleaning up HTML display logic. r=jrburke
Bug 1052447 - [Messages] when we're in an activity and we delete all messages in the thread, we should close the activity r=azasypkin
Bug 1056969 - New data/roaming alignment

Conflicts:
	apps/system/js/statusbar.js
Bug 1062168 - [Contacts] Not clearly Process when user does a search to set ICE contact,
Bug 1061690 - System dialogs are truncated if closed while the keyboard is being shown. r=alive
Bug 1068356 - Authentication screen remains indefinitely when long tapping on the homescreen button in the FxAccount login proccess. r=alive
Bug 1064898 - Time picker is not displaying AM/PM for 12 hours format after change locale
Bug 1068860 - Allow ModalDialog to display pure strings r=gandalf

We may need to have to display strings that are not localized and for
which it does not make sense to have localization at all. This happens
for network-generated messages that we have to display to the user, on a
CDMA network for example.

Conflicts:
	build/jshint/xfail.list
Bug 1069236 - fix attention notification style
Bug 1069997 - Implement the progress to spec for the updates notifications and prevent a constant restyle.
Bug 1068978 - [CBS] Migrate all ril.cellbroadcast.disabled setting to multi client format