// blocklink: wording.
//Version update
Merge branch 'dev'
//Version update

Conflicts:
	blocklink.php
	config.xml
Merge branch 'dev'
// Added Readme.md
// Added Readme.md
Merge remote-tracking branch 'origin/dev'