Merge branch 'master' of https://github.com/Financial-Times/next-dobi into flags

* 'master' of https://github.com/Financial-Times/next-dobi:
  Populate the stream id from server side rather than rely on client side context
  Fix smoke tests for following stuff
  Keep favourite button HTML inline
  Fix jshint errors
  Use next-user-preferences v2 in bower
  Rename to following-streams
  Fix all the other user pages
  Make stream title a link
  Load items from stream for followed topics
  Allow rendering of stream list as a partial

Conflicts:
	bower.json
	client/main.js
	templates/components/stream.html
	templates/layout.html