add missing locale
much more flexible article upload

Conflicts:
	app/controllers/articles_controller.rb