Melhorias
Merge branch 'master' of github.com:monocon/openerp-project-scrum

Conflicts:
	project.py
	project_view.xml