Fix composer and code style
Fix composer json for adding to packagist
Add composer lock
Merge branch '3.2/master'