translations
Merge remote-tracking branch 'upstream/master'
mix translations
translation on flash controller observations
minor change
Merge pull request #72 from calonso-conabio/master

translations CONABIO
Bugfix: oauth_applications/show was broken for app owners.
Minor translation.
Minor bugfix.
Merge branch 'master' into sounds

Conflicts:
	config/locales/en.yml
	public/javascripts/translations.js