Update deploy.sh for VM and params.php to modify an encoding setting for MySQL
Add spec files for Trial VM (using Serverspec 2)
Merge pull request #191 from msyk/modify-encoding-setting

Update deploy.sh for VM and params.php to modify an encoding setting for MySQL
Merge branch 'master' into soft-delete
Soft-Delete mostly finished, but it does't check on FMS.