Merge branch 'manter_usuarios' into release1

Signed-off-by: Jefferson Xavier <jeffersonx.xavier@gmail.com>
Signed-off-by: Álex Mesquita <alex.mesquita06@hotmail.com>
Signed-off-by: Keli Borges <keliunb@gmail.com>
Signed-off-by: Carlos Alberto <carlosjunior117@hotmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/routes.rb
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
	test/test_helper.rb
Merge branch 'manter_usuarios' into release1

Signed-off-by: Jefferson Xavier <jeffersonx.xavier@gmail.com>
Signed-off-by: Álex Mesquita <alex.mesquita06@hotmail.com>
Signed-off-by: Carlos Alberto <carlosjunior117@hotmail.com>
Signed-off-by: Keli Cristina <keliunb@gmail.com>

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
config app routes
Integrating the login page.
solve merging convlicts
Integrating the login page.
Merge branch 'views' of github.com:EscalaSaudeDF/TEM-DF into views
solve merge conflicts