Bug 825698 - move youtube-specific code from chrome to gaia r=jdm a=blocking+
Bug 804394 - [Clock] if more than one alarm is set and goes off and the screen lock is placed, only the top alarm is disabled.
Merge pull request #7342 from davidflanagan/bug825698

Bug 825698 - move youtube-specific code from chrome to gaia r=jdm a=blocking+
Bug 799837 - Implement THISANDFUTURE handler ( completely in the ical layer )
Bug 796743 - Incremental recurring event expansion.
Merge pull request #7305 from lightsofapollo/bug-796743-incremental-recurring-expansion

Bug 796743 / 799837 -  incremental recurring expansion / THISANDFUTURE impl
Merge pull request #7370 from ian-liu/clock/Bug804394_handle_previous_alarm_when_next_alarm_goes_off

Bug 804394 - [Clock] if more than one alarm is set and goes off and the screen lock is placed, only the top alarm is disabled.
Auto-merge from branch 'master'