Add flash video onebox support
http://meta.discourse.org/t/will-there-be-flash-videos-in-the-future/7787
Add a list of  for file uploads
Refactor update_all statements in order to prevent deprecation warnings in Rails 4
Fix German translation of user_automatically blocked template

Right now this bug prevents blocking with German locale.
Front end mods to use combobox for selecting user's trust level
Back end - temporary boosting of trust levels
Update client.fr.yml

Missing capital on homepage
Update server.fr.yml

added cas_domainname
Update server.fr.yml

Added few POPS3 translations and few things
Update server.fr.yml
Merge pull request #1132 from ThomasHarper/patch-8

Update client.fr.yml
Merge pull request #1130 from adrianlang/patch-1

Fix German translation of user_automatically blocked template
Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls

Conflicts:
	app/services/spam_rules_enforcer.rb
Fix update statement for Rails 4 preparation
Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions

Conflicts:
	app/models/site_setting.rb
FIX: Removed some leftover posts references outside of the stream
FIX: Support underscores in autocomplete widget
Don't double render faq and privacy policy
FIX: Small bugs with progress indicator
FIX: Links to images in posts won't go through the Discoruse router