Update course_id field to use more generic terminology for external mappings (in accordance with external mappings plugin on wordpress side).
Change "next blog num" logic a bit.  cache list of all blogs associated with course (including inactive).
Merge branch 'develop' into feature/wordpress
Pare down list of blogs displayed in index view to those accessible by the canvas user, via a new xmlrpc call.
Add an "admin" view that shows all blogs linked to course regardless of authorization.  That page is where new blogs are created or existing blogs are associated.  Add an "unlink" button in list that will POST a request to disassociate blog from course.  Don't rely on cache for development (this will change in future).
Merge branch 'develop' into feature/wordpress
Updates based on UI designs
Moved URL values  to settings files
Some cleanup of edit method  and changes for retrieving URLs from settings files.
Merge branch 'develop' into feature/ConfluenceWiki

# By Parker, Eric P
# Via Parker, Eric P (2) and Colin Murtaugh (1)
* develop:
  added qa db setting and updated how dev and qa passwords are accessed
  added check for fas media url before http->https switch
  text changes
  check if the video url is https or not, if not change it to https
  added comment
  added back download mode from player
  removed download mode from player
  replacing video url to start with https instead of http
Temporarily override Wiki config for QA
Fixed the wiki xmlrpc URL
Merge pull request #8 from Harvard-University-iCommons/develop

Merge wiki tool config changes to master
Modified https to http for wiki config temporarily to test with tunneling
initial commit of lit templates
initial commit of lit templates
Updates based on UI designs cont..
Merge branch 'develop' into feature/Add_People_Tool
templates for wikiLTI
Merge branch 'develop' into feature/LTI_Templates