130304prostetnic
Merge remote-tracking branch '130304prostetnic/master'

Conflicts:
	data/search.js
	data/shared.js
	lib/hlutils.js
	lib/main.js
	package.json