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

Gemfile.lock

README.md

app/assets/stylesheets/admin.sass

app/views/devise/confirmations/new.html.erb

app/views/devise/passwords/edit.html.erb

app/views/devise/passwords/new.html.erb

app/views/devise/registrations/edit.html.erb

app/views/devise/registrations/new.html.erb

app/views/devise/sessions/new.html.erb

app/views/devise/shared/_links.html.erb

...factor_authentication/max_login_attempts_reached.html.erb

app/views/devise/two_factor_authentication/show.html.erb

app/views/devise/unlocks/new.html.erb

app/views/layouts/devise.html.erb

config/database.yml

config/locales/en.yml

config/locales/fr.yml

db/schema.rb

lib/tasks/app.rake

...ontrollers/communication/website/pages_controller_test.rb