Added conditional more button to stream
fixing conflicts to pull

Conflicts:
	app/views/users/view.jade
pulling
Merge branch 'master' of https://github.com/mthjones/seng513