Merge branch 'illuminate-5'

Conflicts:	composer.lock	tests/unit/config/ConfigDeployTest.php

Author: endel

Makefile

@@ -30,7 +30,7 @@ endif
 @echo "Finished"
 
 test:
-./vendor/bin/phpunit --configuration ./tests/phpunit.xml
+./vendor/bin/phpunit --configuration ./tests/phpunit.xml --testsuite unit
 # DB_DRIVER=mysql ./vendor/bin/phpunit --configuration ./tests/phpunit.xml
 # DB_DRIVER=postgres ./vendor/bin/phpunit --configuration ./tests/phpunit.xml
 # DB_DRIVER=sqlite ./vendor/bin/phpunit --configuration ./tests/phpunit.xml

README.md

@@ -11,16 +11,14 @@ hook is a RESTful, extendable Backend as a Service that provides instant backend
 to develop sites and apps faster, with dead-simple integration for iOS, Android,
 JavaScript and more.
 
-It follows the same principles from [nobackend](http://nobackend.org/), [hoodie.js](https://github.com/hoodiehq/hoodie.js) and [Parse](http://parse.com)
-
-**Requirements**: PHP 5.4+, or [PHP
+**Requirements**: PHP 5.5+, or [PHP
 5.3](http://doubleleft.github.io/hook-userguide/More/Deployment/#deploying-on-php-53).
 
 - [Features](#features)
 - [Installation](#installation)
 - [How to use](#how-to-use)
 - [Documentation](http://doubleleft.github.io/hook-userguide/)
-- [Front-end integration](#front-end-integration)
+- [Examples](https://github.com/doubleleft/hook-examples)
 
 Features
 ---

composer.json

@@ -17,10 +17,11 @@
  "composer/composer": "1.0.0-alpha10",
  "endel/Slim": "dev-master",
  "doctrine/dbal" : "2.*",
- "illuminate/database": "4.1.*",
- "illuminate/config": "4.1.*",
- "illuminate/cache": "4.1.*",
- "illuminate/encryption": "4.1.*",
+ "illuminate/database": "5.1.*",
+ "illuminate/config": "5.1.*",
+ "illuminate/cache": "5.1.*",
+ "illuminate/encryption": "5.1.*",
+ "illuminate/events": "5.1.*",
  "patchwork/utf8": "~1.2",
  "swiftmailer/swiftmailer": "5.0.*",
  "zordius/lightncandy": "~0.19",
@@ -29,7 +30,7 @@
  "react/socket": "0.4.*"
  },
  "require-dev": {
- "jenssegers/mongodb": "1.3.*",
+ "jenssegers/mongodb": "2.1.*",
  "mockery/mockery": "0.8.0",
  "phpunit/phpunit": "3.7.*",
  "aws/aws-sdk-php": "2.7.*",