Clean up composer
Update Router.php
Make DataMapper update nulls
Update String
Update String quote