minor changes to models
Merge branch 'master' of github.com:theodi/tsb-project-data

Conflicts:
	app/models/project.rb