annotations for documentation
	modified:   app/helpers/calendar_helper.rb
	modified:   app/helpers/nav_link_helper.rb
	modified:   app/helpers/public/super_user_sessions_helper.rb
	modified:   app/helpers/public/user_sessions_helper.rb
	modified:   app/mailers/user_mailer.rb
	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_user_parameter.rb
	modified:   app/models/event.rb
	modified:   app/models/feedback.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
	modified:   app/views/rasocomp/time_offs/index.html.erb
	new file:   public/_temp_up_excel_files/1358348444FragileData.xls
	new file:   public/_temp_up_excel_files/1358350677FragileDataXLS.xls
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	app/models/course.rb
More annotations for documentation
Merge branch 'master' of github.com:RasoTeam/platform
Merge branch 'master' of github.com:RasoTeam/platform
documentation files
	modified:   .yardoc/checksums
	modified:   .yardoc/object_types
	modified:   .yardoc/objects/root.dat