Merge branch 'rb2.4.0'
Merge branch 'master' of github.com:ilios/ilios
Merge branch 'master' of github.com:ilios/ilios
Merge branch 'master' of github.com:ilios/ilios
Merge branch 'master' of github.com:ilios/ilios
refactored javascript out of view includes-template.
replaced injected PHP variables  with calls to client-side JS translation object.
fixed load order.
WIP: replacing markup generation code with markup template.
added 'no date selected' to language files.
added 'course title' entry to language files.
injected PHP vars into markup.
ditched markup generator code.
removed obsolete function createContentContainerMarkup().
changed calendar feed url to shorten '/api/calendar/' to '/iCal/', updated .htaccess to handle redirection
Check length of URL to help avoid Google Calendar gotcha
Merge branch 'master' of github.com:ilios/ilios into 513_calendar_feed_url_length
Merge pull request #516 from Trott/513_calendar_feed_url_length

513 calendar feed url length
Merge branch 'master' into 513_calendar_feed_url_length
added rewrite rule to web.config for IIS servers
Merge branch '513_calendar_feed_url_length' of github.com:ilios/ilios into 513_calendar_feed_url_length