0.1.28
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/hlkiller/db_generator.php