fix
Merge branch 'master' of https://github.com/darthmaim/gw2treasures-assets

Conflicts:
	src/js/mainsearch.coffee