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
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
Merge branch '513_calendar_feed_url_length' of github.com:ilios/ilios into 513_calendar_feed_url_length
add apt-get update to update package install list
fix Google Calendar feed issue by shortening token by 24 characters (using SHAi-1 instead of SHA-256 for token generation)
change expected token length
mv apt-get update to before_install per http://docs.travis-ci.com/user/build-configuration/#Build-Lifecycle
Merge branch 'master' of github.com:ilios/ilios into 513_calendar_feed_url_length
Merge pull request #517 from ilios/513_calendar_feed_url_length

513 calendar feed url length