Split editing year from current year settings
Return current year in programmes
Enable use of "current" as year
modified routes to allow for the possibility of 'current' being a valid year for the xcri cap feed
fixed the xcri task to use 'current' as the default year, not '2014'
added settings rollover tasks
updated the rollover script to simplify the overridable and immutable fields
Merge pull request #623 from unikent/feature/current_year_settings

Feature/current year settings [READY TO MERGE]
Merge pull request #625 from unikent/develop

develop to master