Linking icons on header and removed link on logo of panel.
Merge branch 'link_icon_header' into nightly
Merge branch 'nightly' of github.com:kolaborativa/redekolaborativa into nightly
Merge: Conflict corrected.
Merge branch 'nightly' of github.com:kolaborativa/redekolaborativa into nightly
Conflict corrected.

Conflicts:
	views/layout_rede.html
Removed the extra options menu (Listar meus projetos and Editar Perfil).
Merge branch 'link_icon_header' into nightly
Merge branch 'reset_password'
Merge branch 'change_password'

Conflicts:
	controllers/default.py
Merge branch 'create_project'

Conflicts:
	models/db.py
	views/default/panel.html
Merge branch 'validacaoHome'

Conflicts:
	controllers/default.py
	models/db.py
Merge branch 'master' of github.com:kolaborativa/redekolaborativa

Conflicts:
	controllers/default.py
	models/db.py
Merge branch 'editar_perfil'

Conflicts:
	views/default/edit_perfil.html
	views/layout_rede.html
Merge branch 'perfil_user'
Merge branch 'create_project'
Merge branch 'menu_global'

Conflicts:
	static/css/stylesheet.css
Merge branch 'painelPrincipal'

Conflicts:
	views/default/panel.html
	views/layout_rede.html
Merge branch 'nightly' of github.com:kolaborativa/redekolaborativa into nightly.
Conflict corrected.

Conflicts:
	views/layout_rede.html
Added correct links on icon's header.
Merge branch 'link_icon_header' into nightly.
Conflict corrected.

Conflicts:
	models/db.py
	static/js/redekolaborativa/editar_perfil.js
	views/default/edit_perfil.html
	views/default/panel.html
	views/layout_rede.html