use ruby new hash syntax
Merge branch 'master' of github.com:catarse/catarse

Conflicts:
	app/models/project.rb