Merge branch 'master' of https://github.com/shoghicp/PocketMine-MP

.travis.yml

@@ -2,11 +2,6 @@ language: php
 
 php:
  - 5.4
- - 5.5
- 
-matrix:
- allow_failures:
-  - php: 5.5
   
 before_script:
  - sudo pecl install channel://pecl.php.net/pthreads-0.0.42

src/API/BanAPI.php

@@ -138,7 +138,7 @@ class BanAPI{
 						$output .= "Player \"$user\" added to white-list\n";
 						break;
 					case "reload":
-						$this->whitelist = $this->load(FILE_PATH."white-list.txt", CONFIG_LIST);
+						$this->whitelist = new Config(FILE_PATH."white-list.txt", CONFIG_LIST);
 						break;
 					case "list":
 						$output .= "White-list: ".implode(", ", $this->whitelist->getAll(true))."\n";