Mapa Contacts
Fix Layout
importsingle into new structure AND xlsx support
Merge branch 'master' of github.com:RasoTeam/platform
	modified:   app/helpers/rasocomp/importsingle_helper.rb
	modified:   config/routes.rb
Merge branch 'master' of https://github.com/RasoTeam/platform into testing
Mailer
Routes fix
slug removed when creating company
	modified:   app/controllers/public/companies_controller.rb
	modified:   app/controllers/rasocomp/users_controller.rb
	modified:   app/views/public/companies/new.html.erb
	modified:   app/views/rasocomp/users/index.html.erb
	modified:   config/routes.rb
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	app/views/public/companies/new.html.erb
	app/views/rasocomp/users/index.html.erb
	modified:   Gemfile
feedback
Merge branch 'master' of github.com:RasoTeam/platform
assets:precompile
Fiz Import Time_offs
Merge branch 'master' of https://github.com/RasoTeam/platform into testing
Feedback 2
Verification Email
courses enroll/unenroll
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	db/schema.rb