Single entry attribute
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/helpers/projects_helper.rb
	db/schema.rb
Commit after merges and conflicts