update release
update
update source
Merge branch 'master' of github.com:yhong/nf

Conflicts:
	config/template/plugins/block.I.php