fix
fix dodelete
fix delete
fix encoding
new task
delete
Merge branch 'master' of github.com:maddog670/stream-info

Conflicts:
	engine/inc/stream-info.fnc.php
	engine/modules/stream-info-block.php
	engine/modules/stream-info.php