inte offer
Merge branch 'master' of https://github.com/ggueno/projecteel
Merge branch 'master' of https://github.com/ggueno/projecteel
fix errors push project and apply offer
Merge branch 'master' of https://github.com/ggueno/projecteel

Conflicts:
	templates/project/show_project.html