Merge branch 'db_name'
Merge branch 'db_name'
File: static/js/rede_javascript.js.  I have not changed that file, but I needed commit him.
Merge branch 'remove_logo_header'. Conflit corrected.

Conflicts:
	models/db.py
	static/js/rede_javascript.js
Merge branch 'same_header_of_index'. Conflict corrected.

Conflicts:
	views/layout_rede.html
Merge branch 'logo_link_to_panel'. Conflict corrected.

Conflicts:
	views/layout_rede.html
reset_password with layout implemented
Merge branch 'reset_password' into nightly

Conflicts:
	models/db.py
page 'change_password' with layout implemented
Merge branch 'change_password' into nightly