Mudando usuario para usuarios
Merge branch 'master' of https://github.com/Eliada/SinLab into edit_no_modal

Conflicts:
	app/controllers/usuarios_controller.rb
	app/views/banco_de_horas/index.html.erb
	app/views/projetos/_modal.html.erb
	app/views/projetos/index.html.erb
	app/views/projetos/show.html.erb
	app/views/usuarios/create.html.erb
Merge branch 'master' of https://github.com/Eliada/SinLab into edit_no_modal
Retirado teste de controller
Merge branch 'master' of https://github.com/Eliada/SinLab into add_atividades
Inserindo nested_forms para inclusão de atividades
Merge branch 'master' of https://github.com/Eliada/SinLab into add_atividades
Adicionando atividades com nested_form
Arrumado mais ou menos o form de atividades
Merge branch 'master' into add_atividades