Bug 973616 - [Camera] Videos should be recorded to final location
Bug 947816 - [music] Test parsing of id3v2.* metadata
Merge pull request #16690 from jimporter/music-id3-tests

Bug 947816 - [music] Test parsing of id3v2.* metadata
Merge pull request #16371 from wilsonpage/bug/973616

Bug 973616 - [Camera] Videos should be recorded to final location
Revert "Bug 972666 - [Calendar] lines over events longer than 2 hours"

This reverts commit b7271eda0061be6e2dd223392b519dfb45157512.

Conflicts:
	apps/calendar/style/week_view.css

Reverting due to intermittent failing marionette test.
Bug 978433 - Disable intermittent failing unit test
Merge pull request #16758 from KevinGrandon/bug_978433_disable_failing_test

Bug 978433 - Disable intermittent failing unit test
Bug 959694 - Combine Rocketbar and statusbar