Merge pull request #17 from gregorybesson/develop

Fixing UT error
Merge pull request #26 from gregorybesson/develop

1.0.0
Merge pull request #29 from gregorybesson/develop

1.2.0 Cyclops
Merge pull request #31 from gregorybesson/develop

Elfinder fix
Merge pull request #37 from gregorybesson/develop

Travis CI
Merge pull request #38 from gregorybesson/master

Master