Merge branch 'olditems'
Merge branch 'recipes'
added "karma cost" column to the recipes
Added Karma Price to calculation
Added Karma price to overview
Merge remote-tracking branch 'upstream/master'

Conflicts:
	controllers/helpers.php
	daemons/worker-recipe.php
Merge pull request #106 from mercutiodesign/master

Merge conflict duplicate line of code