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.
Merge branch 'master' of dev.sourcefabric.org:airtime
Merge branch '2.5.x'
Merge branch 'master' of https://github.com/jamieconnor/Airtime

Conflicts:
	airtime_mvc/application/services/ShowService.php
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
Fixed small typo
Update .po files
i18n - Update mo files
Update airtime version in po files
Merge branch '2.5.x' of git://github.com/sourcefabric/Airtime into 2.5.x
Updated British localization for 2.5.0