Fix name of evaluation column
Merging upstrem/master
Merge remote-tracking branch 'upstream/master' into fix-evaluation

Conflicts:
	app/assets/angular-portfolio-all.min.js
	app/assets/angular-portfolio-all.min.map
Merge pull request #9 from dinoboff/fix-evaluation

Fix evaluation