Update components branch alias for dev-master.

Signed-off-by: crynobone <crynobone@gmail.com>
return boolean from Filesystem::delete.
fix conflicts.