Merge branch 'develop' into release/1.0.3
Merge branch 'release/1.0.3'
Merge branch 'develop' into release/1.0.4
Merge branch 'develop' into release/1.0.5
Merge branch 'master' into develop
Documentation updates, fixes https://github.com/burzum/cakephp-imagine-plugin/issues/27
Merge branch 'develop' into 3.0
Merge branch '3.0' of git://github.com/burzum/cakephp-imagine-plugin into 3.0