Merge branch 'hotfix/1.2.1' into develop
Merge branch 'master' into develop
New: initial composer support
New: initial Travis-CI support
New: ignore composer files
Version bump
Merge branch 'release/2.0.1'