Merge branch '2.4.x'
Update jplayer to 2.4.0
added optional parameter number_of_days for getting schedule information
added more options for show repeats
Removed repeated code
Follow up changes relating to adding in new show repeat options
Modified weekInfo from ApiController to display current week and next, changed widget to display extra days.
CC-5323: User's Timezone Can Improperly Edit Show
CC-5323: User's Timezone Can Improperly Edit Show
CC-5323: User's Timezone Can Improperly Edit Show

-made localizeDate a static function in ShowFormService
CC-5323: User's Timezone Can Improperly Edit Show

-added comments to timezone getters and setters in Prefences model
 to reduce confusion on station timezone and user timezone
CC-5323: User's Timezone Can Improperly Edit Show

-overlapping show check was using the user's local timezone to compare new
 shows instead of the show's timezone
CC-5323: User's Timezone Can Improperly Edit Show

- fixed to use show's timezone instead of user's timezone when updating a show's
  start and end time after a show has been edited
CC-5323: User's Timezone Can Improperly Edit Show
CC-5323: User's Timezone Can Improperly Edit Show
CC-5323: User's Timezone Can Improperly Edit Show

-made localizeDate a static function in ShowFormService
CC-5323: User's Timezone Can Improperly Edit Show

-added comments to timezone getters and setters in Prefences model
 to reduce confusion on station timezone and user timezone
CC-5323: User's Timezone Can Improperly Edit Show

-overlapping show check was using the user's local timezone to compare new
 shows instead of the show's timezone
CC-5323: User's Timezone Can Improperly Edit Show

- fixed to use show's timezone instead of user's timezone when updating a show's
  start and end time after a show has been edited
CC-5323: User's Timezone Can Improperly Edit Show

Edit show from was displaying rebroadcast dates in user's timezone
instead of in the show's timezone