corrected spec labels
Include /^http... prefix in onebox whitelist URLs regexes to prevent XSS.
Be more selective about when we allow oembed discovery
Prevent event bubbling on search toggles to keep dropdown open
remove trailing whitespaces :heart:
Pluralization bug when hovering on likes
Merge pull request #270 from ZogStriP/patch-2

Pluralization bug when hovering on likes
Merge pull request #268 from tms/vanishing-search

Prevent event bubbling on search toggles to keep dropdown open
Merge pull request #267 from tms/onebox-safety

Tighten up onebox rendering
Merge pull request #265 from ZogStriP/robots-txt

corrected spec labels for robots.txt controller
Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse

Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
Remove fastclick for now -- we saw some regressions on iPad and want to make sure they weren't caused by
it.
Fixes title regression
Add 'descrption' to categories, even when in a Combobox
Fixes #157 - Add mention of seed_fu to docs.
Show discourse version in an html comment
Clean up discourse.js
fixes: http://meta.discourse.org/t/discourse-logo-link-back-to-top-of-thread-list-on-home-page/3592
The avatar helper should be smart enough to find a nested avatar_template. Fixes #243
Add site settings for company name and domain, and use them in the Terms of Service