Avances varios
Merge branch 'master' of github.com:redvel-ltda/tsp

Conflicts:
	app/controllers/projects_controller.rb