Allow for oEmbed to be used on HTTPS
List options improvements
Follow up on list options improvements
Merge pull request #3011 from nicolaasmatthijs/issue-3004-oembed-https

Allow for oEmbed to be used on HTTPS
Making the notification container smaller so its not hiding other functionality when a notification is shown.
Merge pull request #2931 from simong/issue-2931-notifications-hiding-functionality

Notifications shouldn't block user interactions with items in the top navigation bar
Merge branch 'listOptions' of git://github.com/bp323/3akai-ux into listOptions
Docs improvements + background fix
Merge branch 'master' into issue-2867-delete-content

Conflicts:
	node_modules/oae-core/contentlibrary/contentlibrary.html
	node_modules/oae-core/discussionslibrary/discussionslibrary.html