quote gets added to the active composer instead of starting a new one.
Merge remote-tracking branch 'upstream/master'
Merge pull request #890 from tedr56/master

Fr Translation Update
simplified a conditional
added "pages" translation file to languages
new translation strings for pages, proper unicode handling in parseFragment
updated language files to match english pages.json
Merge branch 'master' of github.com:designcreateplay/NodeBB
timeago fix for brasilian portugueso
errant semicolon
upgrade scripts for sso plugins
Merge branch 'master' of github.com:mattijle/NodeBB into mattijle-master
tweaks and formatting
Fr translation update