Merge branch 'dev'
// update version number
Merge branch 'dev'

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