diaarezz
Merge remote-tracking branch 'upstream/development'

Conflicts:
	Gemfile
	app/assets/stylesheets/custom.css.scss
	app/controllers/cofiles_controller.rb
	app/views/cofiles/index.html.haml
	app/views/layouts/_header.html.haml
	config/database2back.yml
	config/routes.rb
	db/schema.rb