fixed #776
Merge branch 'master' of github.com:designcreateplay/NodeBB
limit search in db
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
removed teaser_text
fixed #744
Merge branch 'master' of github.com:designcreateplay/NodeBB
added profile func, shorter getRecentReplies
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
upload file icon in composer was visible even when uploads were disabled
prevent clicks on autocomplete to scroll window to the top
Chat now supports markdown
removed inline css
added try catch to socket calls
Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Conflicts:
	public/src/modules/composer.js