assets:precompile
assets:precompile
Merge branch 'master' of github.com:RasoTeam/platform
assets:precompile
gemfile
	modified:   app/views/rasocomp/courses/new.html.erb
Merge branch 'master' of github.com:RasoTeam/platform
translating
translation of some views
	modified:   app/views/rasocomp/companies/new.html.erb
	modified:   app/views/rasocomp/contracts/_list.html.erb
	modified:   app/views/rasocomp/contracts/show.html.erb
	modified:   config/locales/en.yml
	modified:   config/locales/pt.yml
translation of strings on html
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	app/views/rasocomp/evaluations/personal_evaluations.html.erb
	modified:   Gemfile.lock
Merge branch 'master' of github.com:RasoTeam/platform
	modified:   .yardoc/checksums
	modified:   .yardoc/object_types
	modified:   .yardoc/objects/root.dat
	modified:   doc/index.html