Merge branch '2.x' into develop

.travis.yml

@@ -2,7 +2,6 @@ language: php
 sudo: false
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0

README.md

@@ -1,7 +1,7 @@
 # Imagine Plugin for CakePHP3 #
 
-[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.txt) 
-[![Build Status](https://img.shields.io/travis/burzum/cakephp-imagine-plugin/3.0.svg?style=flat-square)](https://travis-ci.org/burzum/cakephp-imagine-plugin) 
+[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.txt)
+[![Build Status](https://img.shields.io/travis/burzum/cakephp-imagine-plugin/3.0.svg?style=flat-square)](https://travis-ci.org/burzum/cakephp-imagine-plugin)
 [![Coverage Status](https://img.shields.io/coveralls/burzum/cakephp-imagine-plugin/3.0.svg?style=flat-square)](https://coveralls.io/r/burzum/cakephp-imagine-plugin)
 
 The **Imagine** plugin is a CakePHP wrapper around the [Imagine image manipulation library](https://github.com/avalanche123/Imagine). It makes it very easy to manipulate image data like resize, thumbnail, crop or even to do more complex tasks like creating a photo collage. Also it abstracts the different ways, GD, Imagick, Imagick Shell to work with image data in php.
@@ -30,8 +30,6 @@ Contributing
 
 To contribute to this plugin please follow a few basic rules.
 
-To contribute to this plugin please follow a few basic rules.
-
 * Pull requests must be send to the ```develop``` branch.
 * Contributions must follow the [PSR2-**R** coding standard recommendation](https://github.com/php-fig-rectified/fig-rectified-standards).
 * [Unit tests](http://book.cakephp.org/3.0/en/development/testing.html) are required.

composer.json

@@ -17,7 +17,7 @@
 		"cakephp/plugin-installer": "*"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "*"
+		"phpunit/phpunit": "4.*"
 	},
 	"autoload": {
  		"psr-4": {