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

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