Merge remote-tracking branch 'mercutiodesign/searchfilter'
Merge branch 'master' of github.com:rubensayshi/gw2spidy
Merge branch 'master' of github.com:rubensayshi/gw2spidy
removed double negative from money formatting (66850c4 by mercutiodesign)
Merge remote-tracking branch 'mercutiodesign/karma' into karma

Conflicts:
	controllers/helpers.php
	templates/item.html.twig
	templates/recipe_list.html.twig
track and show last updated for items
cleanup
Merge remote-tracking branch 'mercutiodesign/craftwithkarma'

Conflicts:
	controllers/helpers.php
Merge remote-tracking branch 'mercutiodesign/craftwithkarma'
update karma proce for in bulk stuff
updated sql
merged upstream/master
removed karmaprice from gw2dbitem table