Added SAMI configuration file.
Modified comment blocks of Erdiko class.
Updated Sami config.
Fixed comment block issues.
Updated Sami’s config.
Updated Sami config.
Updated version number.
Updated Sami configuration.
Added phpDocumentor2.
Merge remote-tracking branch 'refs/remotes/Upstream/master'

Conflicts:
	src/vendor/erdiko/core/Response.php
Resolve merge issues.
Update gitignore
Merge commit '2ed4edbe8df119474f636f44aff01cd44a0dc8ee'
Updated composer.
Moved composer.json to root.
Move phpdoc out of the repo.
Updated Erdiko class and File class.
Fixed all error of Php doc.
Merge remote-tracking branch 'upstream/master'
Removed version from composer.json