Fixed the version reported by PhpSpec in the dev version
Updated the changelog
Merge branch 'master' into develop
Bumped the dev version to 2.1-dev in the executable