some minor refactorings
Merge branch 'pr/49'

Conflicts:
	app/models/project.rb
	app/models/user.rb