Update composer.json
Update composer.json
---
Update composer.json
Update composer.json
edit README
update version 3.1.17
Update Smarty 3.1.18
Merge branch 'master' into 3.1.x

Conflicts:
	composer.json
Download Smarty 3.1.19