Invoice generation v1
Merge branch 'master' of github.com:RasoTeam/platform
Application upgraded to Rails 3.2.11

http://arstechnica.com/security/2013/01/extremely-crtical-ruby-on-rails-bug-threatens-more-than-200000-sites/
Developers should run "bundle update rails"
Merge branch 'master' of github.com:RasoTeam/platform
Gemfile
Modulo Avaliacoes: Update 4 - Alteracoes drasticas no modelo de dados
Merge branch 'master' of github.com:RasoTeam/platform
documentation added to models;
	modified:   .yardoc/checksums
	modified:   .yardoc/object_types
	modified:   .yardoc/objects/root.dat
	modified:   Gemfile.lock
	modified:   app/models/bill.rb
	modified:   app/models/candidate.rb
	modified:   app/models/company.rb
	modified:   app/models/contract.rb
	modified:   app/models/course.rb
	modified:   app/models/course_signup.rb
	modified:   app/models/evaluation.rb
	modified:   app/models/evaluation_parameter.rb
	modified:   app/models/evaluation_user_parameter.rb
	modified:   app/models/event.rb
	modified:   app/models/feedback.rb
	modified:   app/models/import_logic.rb
	modified:   app/models/job_offer.rb
	modified:   app/models/parameter.rb
	modified:   app/models/period.rb
	modified:   app/models/super_user.rb
	modified:   app/models/time_off.rb
	modified:   app/models/training.rb
	modified:   app/models/user.rb
Gemlock change
fix annotate conflicts
adds changes to test files