Add check for SCM
Fix wrong use of composer.phar
Move Traits to a Traits folder
Work on tests
Bump version
Merge branch 'develop'