Merge branch 'master' of github.com:noesya/osuny

Gemfile

Gemfile.lock

app/assets/javascripts/admin.js

app/assets/javascripts/application.js

app/assets/stylesheets/admin.sass

app/assets/stylesheets/admin/appstack.sass

app/assets/stylesheets/application.sass

app/assets/stylesheets/commons/links.sass

app/models/research/journal/article.rb

app/views/admin/application/_nav.html.erb

app/views/admin/layouts/application.html.erb

app/views/application/_footer.html.erb

app/views/layouts/application.html.erb

app/views/layouts/devise.html.erb

config/locales/en.yml

config/locales/fr.yml

db/schema.rb