readonly transcript search on separate lines #106
#155. Display publisher's name in video info in user portal.
Fix #155. Retry fetching publisher only on timeout.
Merge branch 'develop' into feature/publisher-name

# By Tuhin Chakraborty (37) and others
# Via Tuhin Chakraborty (8) and others
* develop: (86 commits)
  build ubc images
  ucb images
  merge with develop (resolved conflicts)
  Converts collaspsible panel cross buttons to svg
  t env points to prod
  fixes bug where undefined shows up in transcript search #122
  fixing a commit error because I didn't pull the latest branch
  added the error state to the search results, needs to be displayed/hidden when less than 3 characters are entered
  switches to global tab when there are no results within this page #122
  adds sections for brilliant and huh #122
  fixes bug where not clearing results before re-searching yeilds limited results #122
  reverses array of results rather than looping backwards #122
  adds toggle functionality to search results #122
  (semi-WIP) adds rendering logic surrounding expanding and collapsing views #122
  improves search clearing logic #122
  (WIP) clear search when user clicks outside results #122
  makes search field wider #122
  clears search when window loses focus #122
  fixes bug where count of results is off and error when trying to clear popovers when they don't exist
  fixes timestamp in search results to convert milliseconds to seconds #122
  ...
Display number of videos of the user in the user portal's media info panel (#157)
update package.json
remove require wrapper from examples; replace require.js by almond (lightweight version); replace handlebars by runtime version
Merge branch 'feature/publisher-name' of https://github.com/koemei/koemei-widget into feature/publisher-name

# By Julien Dupuis
# Via Julien Dupuis
* 'feature/publisher-name' of https://github.com/koemei/koemei-widget:
  Display number of videos of the user in the user portal's media info panel (#157)

Conflicts:
	dist/koemei-widget.js
	src/koemei/coffee/view/rootviews/user_portal/user_portal.coffee
fixed specs except for toolbar
fixed toolbar tests
Fix #162. Repairs like/unlike display in huh/brilliant newsfeed items
Fix #155. Display publisher name's from media data instead of fetching it asynchronously.
Merge branch 'feature/publisher-name' into develop
Merge branch 'feature/newsfeed-like-display' into develop
quick fix for newsfeed player popup
Merge branch 'develop' into feature/transcript-search

# By macqueen (55) and others
# Via Sebastien Dupont (19) and others
* develop: (222 commits)
  quick fix for newsfeed player popup
  Fix #155. Display publisher name's from media data instead of fetching it asynchronously.
  Fix #162. Repairs like/unlike display in huh/brilliant newsfeed items
  fixed toolbar tests
  fixed specs except for toolbar
  remove require wrapper from examples; replace require.js by almond (lightweight version); replace handlebars by runtime version
  update package.json
  Display number of videos of the user in the user portal's media info panel (#157)
  https on external images
  https on external images
  build ubc images
  ucb images
  merge with develop (resolved conflicts)
  Fix #155. Retry fetching publisher only on timeout.
  #155. Display publisher's name in video info in user portal.
  Converts collaspsible panel cross buttons to svg
  CSS: fix Firefox issue in player toolbar, and change cursor over timestamp in notes
  t env points to prod
  fix settings link
  fix settings link
  ...
Merge branch 'feature/transcript-search' into develop
Merge branch 'develop' into feature/transcript

# By Julien Dupuis (5) and others
* develop:
  quick fix for newsfeed player popup
  Fix #155. Display publisher name's from media data instead of fetching it asynchronously.
  Fix #162. Repairs like/unlike display in huh/brilliant newsfeed items
  fixed toolbar tests
  fixed specs except for toolbar
  remove require wrapper from examples; replace require.js by almond (lightweight version); replace handlebars by runtime version
  update package.json
  Display number of videos of the user in the user portal's media info panel (#157)
  Fix #155. Retry fetching publisher only on timeout.
  #155. Display publisher's name in video info in user portal.
  readonly transcript search on separate lines #106

Conflicts:
	dist/koemei-widget.js
	src/koemei/templates/jade/media/segment.jade