* added approved functionality
updated hours registration report
updated list hours registration
updated files
Merge branch 'master' of https://github.com/thiagofc/RubyOnRails

Conflicts:
	hours_colaborator/app/controllers/application_controller.rb
	hours_colaborator/app/views/colaborators/show.html.erb
	hours_colaborator/app/views/hours_registrations/index.html.erb
	hours_colaborator/app/views/hours_registrations/list_hours_colaborator.html.erb