diff --git a/.gitignore b/.gitignore
index 8fa0d0b9..053e1221 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 application/config/database.php
 sftp-config.json
+.idea
\ No newline at end of file
diff --git a/README.md b/README.md
index 20a339d5..aa9b2a37 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,23 @@
 ![PHPBack](http://www.phpback.org/images/logo_300.png)
 
 
-##About
-PHPBack is an open source feedback system you can use for your website.  It gives your customers a way to communicate their ideas to improve your products. User feedback has proved to be really efective even if you have a community project or a commercial project.
-Please, vist our website for more information: [http://www.phpback.org/](http://www.phpback.org/)
+## About
+PHPBack is an open source feedback system you can use for your website.  It gives your customers a way to communicate their ideas to improve your products. User feedback has proved to be really effective even if you have a community project or a commercial project.
+Please, visit our website for more information: [http://www.phpback.org/](http://www.phpback.org/)
 
-##Requeriments
-* PHP 5.3+
+## Requirements
+* PHP 5.6+
 * MySQL 4.1+
 
-##Installation
-Upload this folder in your web server, go to `yourwebsite.com/feedback/` (or folder name) and fill the form.
-If you have any questions, plase visit our [Wiki](https://github.com/ivandiazwm/phpback/wiki/).
+## Installation
+Upload this folder to your web server, go to `yourwebsite.com/feedback/` (or folder name) and fill the form.
+If you have any questions, please visit our [Wiki](https://github.com/ivandiazwm/phpback/wiki/).
 
-##License
+Install on Cloudron, a platform to effortlessly run web apps on your own server.
+
+[![Install](https://cloudron.io/img/button.svg)](https://cloudron.io/button.html?app=org.phpback.cloudronapp)
+
+## License
 PHPBack is licensed under GPLv3 (see `LICENSE.TXT` file) and it was made using Codeigniter Framework (see `system/license.txt` file).
 
 `Ivan Diaz <ivan@phpback.org> © 2014`
diff --git a/application/config/config.php b/application/config/config.php
index 75d88c40..29a54443 100755
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -357,6 +357,17 @@
 */
 $config['proxy_ips'] = '';
 
+/*
+|--------------------------------------------------------------------------
+| AutoUpdater
+|--------------------------------------------------------------------------
+|
+| Toggle the auto updater. If your system has other means to update or
+| phpback is installed on a read-only filesystem, set this to FALSE.
+|
+*/
+$config['auto_update'] = FALSE;
+
 
 /* End of file config.php */
 /* Location: ./application/config/config.php */
diff --git a/application/controllers/action.php b/application/controllers/action.php
index 9be61146..a7638b91 100755
--- a/application/controllers/action.php
+++ b/application/controllers/action.php
@@ -11,7 +11,7 @@
 if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Action extends CI_Controller{
-    
+
     public function __construct(){
         parent::__construct();
         $this->load->helper('url');
@@ -19,11 +19,9 @@ public function __construct(){
         $this->load->model('post');
     }
     public function register(){
-        require_once('public/recaptcha/recaptchalib.php');
-        
+        require_once('public/recaptcha/autoload.php');
+
         $votes = $this->get->getSetting('maxvotes');
-        $title = $this->get->getSetting('title');
-        $mainmail = $this->get->getSetting('mainmail');
 
         $email = $this->input->post('email', true);
         $pass = $this->input->post('password', true);
@@ -31,21 +29,19 @@ public function register(){
         $name = $this->input->post('name', true);
 
         if($this->get->getSetting('recaptchapublic') != ""){
-            $resp = recaptcha_check_answer($this->get->getSetting('recaptchaprivate'),
-                                    $_SERVER["REMOTE_ADDR"],
-                                    $_POST["recaptcha_challenge_field"],
-                                    $_POST["recaptcha_response_field"]);
-            
-            if(!$resp->is_valid){
+            $recaptcha = new \ReCaptcha\ReCaptcha($this->get->getSetting('recaptchaprivate'));
+            $resp = $recaptcha->verify($_POST["g-recaptcha-response"],  $_SERVER['REMOTE_ADDR']);
+
+            if(!$resp->isSuccess()){
                 header('Location: '. base_url() .'home/register/recaptcha');
                 return;
             }
         }
-        if(strlen($name) < 7){
+        if(strlen($name) < 3){
             header('Location: '. base_url() .'home/register/name');
             return;
         }
-        if (!preg_match("/^([a-zA-Z0-9._]+)@([a-zA-Z0-9.-]+).([a-zA-Z]{2,4})$/",$email)){
+        if (!preg_match("/^([a-zA-Z0-9._-]+)@([a-zA-Z0-9.-]+).([a-zA-Z]{2,4})$/",$email)){
             header('Location: '. base_url() .'home/register/email');
             return;
         }
@@ -59,25 +55,17 @@ public function register(){
         }
 
         if($this->post->add_user($name, $email, $pass, $votes, false)){
+            $title = $this->get->getSetting('title');
             $message = "Welcome to our feedback: $title\n\nYour Email: $email\nYour Password: $pass\n\n\nPlease login here:" . base_url() . "home/login\n";
-            $this->load->library('email');
-                 
-            $this->email->initialize($this->get->email_config());
 
-            $this->email->from($mainmail, 'PHPBack');
-            $this->email->to($email); 
+            $this->sendMail($message, "New account - $title", $email);
 
-            $this->email->subject("New account - $title");
-            $this->email->message($message);    
-
-            $this->email->send();
-            
             header('Location: '. base_url() .'home/login/register');
         }
         else header('Location: '. base_url() .'home/register/exists');
-        
+
     }
-    
+
     public function login(){
         session_start();
 
@@ -99,7 +87,7 @@ public function login(){
             header('Location: ' . base_url() . 'home/login/errorlogin/');
         }
     }
-    
+
     public function logout(){
         session_start();
         session_destroy();
@@ -120,17 +108,22 @@ public function vote($votes, $ideaid){
             exit;
         }
         $idea = $this->get->getIdea($ideaid);
-        header("Location: " . base_url() . 'home/idea/' . $ideaid . '/' . str_replace(' ', '-', $idea->title));
+        header("Location: " . $idea->url);
     }
 
     public function unvote($id){
         session_start();
         $vote = $this->get->get_row_by_id('votes', $id);
-        if(isset($_SESSION['phpback_userid']) && $_SESSION['phpback_userid'] == $vote->userid){
+
+        if ($vote && isset($_SESSION['phpback_userid']) && $_SESSION['phpback_userid'] == $vote->userid) {
             $idea = $this->get->getIdea($vote->ideaid);
+            $user = $this->get->getUser($vote->userid);
+
             $this->post->update_by_id('ideas', 'votes', $idea->votes - $vote->number, $idea->id);
+            $this->post->update_by_id('users', 'votes', $user->votes + $vote->number, $user->id);
             $this->post->delete_row_by_id('votes', $id);
         }
+
         header('Location:' . base_url() . 'home/profile/' . $vote->userid);
     }
 
@@ -148,28 +141,28 @@ public function changepassword(){
         if(strlen($new) > 5){
             if($new == $rnew){
                 $user = $this->get->getUser($_SESSION['phpback_userid']);
-                
+
                 if($this->hashing->matches($old, $user->pass)){
                     $this->post->update_by_id('users', 'pass', $this->hashing->hash($new), $user->id);
                     $message = "You have changed your password to: $new\n";
                     $this->load->library('email');
                     $this->email->initialize($this->get->email_config());
-                    
+
                     $mainmail = $this->get->getSetting('mainmail');
                     $title = $this->get->getSetting('title');
 
                     $this->email->from($mainmail, 'PHPBack');
-                    $this->email->to($user->email); 
+                    $this->email->to($user->email);
 
                     $this->email->subject("Password changed - $title");
-                    $this->email->message($message);    
+                    $this->email->message($message);
 
                     $this->email->send();
-                    
+
                     header('Location: ' . $toredirect);
                 }
                 else $this->redirectpost($toredirect, array('error' => 2));
-                
+
             }
             else $this->redirectpost($toredirect, array('error' => 1));
         }
@@ -196,8 +189,20 @@ public function newidea(){
             $this->redirectpost(base_url() . "home/postidea/errordesc", array('title' => $title, 'desc' => $desc, 'catid' => $catid));
             return;
         }
-        if(@isset($_SESSION['phpback_userid']))
+        if(@isset($_SESSION['phpback_userid'])) {
             $this->post->add_idea($title, $desc, $_SESSION['phpback_userid'], $catid);
+            $admins = $this->get->get_admin_users();
+            $adminMails = array_map(function (\stdClass $admin) {
+                return $admin->email;
+            }, $admins);
+            $adminMails = implode(', ', $adminMails);
+            $generalTitle = '' !== $this->get->getSetting('title') ? $this->get->getSetting('title') : 'PHPBack';
+            $lastIdea = $this->get->getLastIdea();
+            $message = sprintf($this->lang->language['log_new_idea_mail_content'], $generalTitle, $lastIdea->url);
+            $fullTitle = $this->lang->language['log_new_idea'] . ' : ' . $generalTitle;
+
+            $this->sendMail($message, $fullTitle, $adminMails);
+        }
         header("Location: " . base_url() . "home/profile/" . $_SESSION['phpback_userid']);
     }
 
@@ -205,23 +210,53 @@ public function comment($idea_id){
         session_start();
         $idea_id = (int) $idea_id;
         $content = $this->input->post('content', true);
-        if(isset($_SESSION['phpback_userid']))
+        if(isset($_SESSION['phpback_userid'])) {
             $this->post->add_comment($idea_id, $content, $_SESSION['phpback_userid']);
-        header("Location: " . base_url() . "home/idea/" . $idea_id . '/' .  $this->input->post('ideaname', true));
+            $comments = $this->get->getCommentsByIdea($idea_id);
+            $usersMails = [];
+            foreach ($comments as $comment) {
+                $usersMails[] = $this->get->getUser($comment->userid)->email;
+            }
+            $usersMails = array_unique($usersMails);
+            $generalTitle = '' !== $this->get->getSetting('title') ? $this->get->getSetting('title') : 'PHPBack';
+            $idea = $this->get->getIdea($idea_id);
+            $message = sprintf($this->lang->language['log_new_comment_mail_content'], $generalTitle, $idea->url);
+            $title = sprintf($this->lang->language['log_commented'], $idea_id);
+
+            $this->sendMail($message, $title, $usersMails);
+        }
+        header("Location: " . $this->get->getIdea($idea_id)->url);
     }
 
-    public function flag($cid, $ideaid, $ideaname){
+    private function sendMail($message, $title, $recipients)
+    {
+        if (empty($recipients)) {
+            return false;
+        }
+        $mainmail = $this->get->getSetting('mainmail');
+        $this->load->library('email');
+
+        $this->email->initialize($this->get->email_config());
+        $this->email->from($mainmail, 'PHPBack');
+        $this->email->to($recipients);
+        $this->email->subject($title);
+        $this->email->message($message);
+
+        return $this->email->send();
+    }
+
+    public function flag($cid, $idea_id){
         session_start();
         if(!isset($_SESSION['phpback_userid'])){
             header("Location: " . base_url(). "home/login");
             exit;
         }
-        $this->post->flag($cid, $_SESSION['phpback_userid']);    
-        header("Location: " . base_url() . "home/idea/" . $ideaid . '/' .  $ideaname);
+        $this->post->flag($cid, $_SESSION['phpback_userid']);
+        header("Location: " . $this->get->getIdea($idea_id)->url);
     }
 
     private function redirectpost($url, array $data){
-        
+
         echo '<html>
             <head>
                 <script type="text/javascript">
@@ -246,4 +281,4 @@ function close() {
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/application/controllers/admin.php b/application/controllers/admin.php
index 5843199a..0077bfb5 100755
--- a/application/controllers/admin.php
+++ b/application/controllers/admin.php
@@ -19,7 +19,7 @@ public function __construct(){
 		$this->load->helper('url');
 		$this->load->model('get');
 
-        $this->version = '1.2.0';
+        $this->version = '1.3.1';
 	}
 
 	public function index($error = 'no'){
@@ -45,6 +45,7 @@ public function index($error = 'no'){
             exit;
         }
 	}
+
     public function dashboard(){
         $this->start();
         $data = array();
@@ -55,6 +56,7 @@ public function dashboard(){
         $this->load->view('admin/dashboard/header');
         $this->load->view('admin/dashboard/index', $data);
     }
+
     public function ideas(){
         $this->start();
         $data = array();
@@ -111,19 +113,28 @@ public function ideas(){
             }
             $data['toall'] = 1;
         }
+
+        $this->redirectIfNotAlphaNumeric(array(
+            $data['form']['orderby']
+        ));
+
         $data['ideas'] = $this->get->getIdeas($data['form']['orderby'], $data['form']['isdesc'], 0, 150, $st, $cat);
+
         $this->load->view('admin/dashboard/header', $data);
         $this->load->view('admin/dashboard/ideas', $data);
     }
     public function users($idban=0){
         $this->start(2);
         $data = array();
+
         $data['users'] = $this->get->get_users();
         $data['banned'] = $this->get->get_users('banned', 100);
+
         if($idban) $data['idban'] = $idban;
         $this->load->view('admin/dashboard/header', $data);
         $this->load->view('admin/dashboard/users', $data);
     }
+
     public function system(){
         $this->start(3);
         $data = array();
@@ -132,14 +143,18 @@ public function system(){
         $data['categories'] = $this->get->getCategories();
         $data['version'] = $this->version;
 
-        $update = new AutoUpdate(__DIR__ . '/temp', __DIR__ . '/../../', 60);
-        $update->setCurrentVersion($this->version); // Current version of your application. This value should be from a database or another file which will be updated with the installation of a new version
-        $update->setUpdateUrl('http://www.phpback.org/upgrade/'); //Replace the url with your server update url
-        $update->checkUpdate();
+        if ($this->get->getAutoUpdaterEnabled()) {
+            $update = new AutoUpdate(__DIR__ . '/temp', __DIR__ . '/../../', 60);
+            $update->setCurrentVersion($this->version); // Current version of your application. This value should be from a database or another file which will be updated with the installation of a new version
+            $update->setUpdateUrl('http://www.phpback.org/upgrade/'); //Replace the url with your server update url
+            $update->checkUpdate();
 
-        $data['lastVersion'] = $update->getLatestVersion();
-        $data['version'] = $this->version;
-        $data['isLastVersion'] = !$update->newVersionAvailable();
+            $data['lastVersion'] = $update->getLatestVersion();
+            $data['isLastVersion'] = !$update->newVersionAvailable();
+        } else {
+            $data['lastVersion'] = $this->version;
+            $data['isLastVersion'] = false;
+        }
 
         $this->load->view('admin/dashboard/header', $data);
         $this->load->view('admin/dashboard/system', $data);
@@ -152,5 +167,17 @@ private function start($level = 1){
             exit;
         }
     }
+
+    private function redirectIfNotAlphaNumeric($textList) {
+        foreach ($textList as $text) {
+            if (!$this->isAlphaNumeric($text)) {
+                header('Location: ' . base_url() . 'admin/');
+                exit;
+            }
+        }
+    }
+
+    private function isAlphaNumeric($text) {
+        return ctype_alnum($text);
+    }
 }
-?>
diff --git a/application/controllers/adminaction.php b/application/controllers/adminaction.php
index 838ae32a..8396bf35 100755
--- a/application/controllers/adminaction.php
+++ b/application/controllers/adminaction.php
@@ -23,7 +23,7 @@ public function __construct(){
 
         $this->lang->load('log', $this->get->getSetting('language'));
 
-        $this->version = '1.2.0';
+        $this->version = '1.3.1';
     }
 
     public function login(){
@@ -168,8 +168,8 @@ public function upgrade() {
         $this->start(3);
 
         $update = new AutoUpdate(__DIR__ . '/temp', __DIR__ . '/../../', 60);
-        $update->setCurrentVersion($this->version); // Current version of your application. This value should be from a database or another file which will be updated with the installation of a new version
-        $update->setUpdateUrl('http://www.phpback.org/upgrade/'); //Replace the url with your server update url
+        $update->setCurrentVersion($this->version);
+        $update->setUpdateUrl('http://www.phpback.org/upgrade/');
 
         $update->checkUpdate();
 
@@ -179,16 +179,12 @@ public function upgrade() {
             //Install new update
             $result = $update->update();
             if ($result !== true) {
-                echo 'Update failed: ' . $result . '!<br>';
-                if ($result = AutoUpdate::ERROR_SIMULATE) {
-                    echo '<pre>';
-                    var_dump($update->getSimulationResults());
-                    echo '</pre>';
-                }
+                echo 'Update failed!<br>';
+                $update->printLogs();
             }
 
-            @include __DIR__. '../config/update.php';
-            @unlink(__DIR__.'../config/update.php');
+            @include __DIR__. '/../config/update.php';
+            @unlink(__DIR__.'/../config/update.php');
         }
 
         header('Location: ' . base_url() . 'admin/system');
diff --git a/application/controllers/home.php b/application/controllers/home.php
index 7223facd..9bdf97f7 100755
--- a/application/controllers/home.php
+++ b/application/controllers/home.php
@@ -27,9 +27,10 @@ public function index() {
         $this->autoLoginByCookie();
 
         //Use this function to parse $freename variables getDisplayHelpers();
-        $data['categories'] = $this->get->getCategories();
-        $data['title'] = $this->get->getSetting('title');
-        $data['lang'] = $this->lang->language;
+        $data = $this->getDefaultData();
+        $data['welcomeTitle'] = $this->get->getSetting('welcometext-title');
+        $data['welcomeDescription'] = $this->get->getSetting('welcometext-description');
+
         $data['ideas'] = array(
             'completed' => $this->get->getIdeas('id', 1, 0, 10, array('completed')),
             'started' => $this->get->getIdeas('id', 1, 0, 10, array('started')),
@@ -44,16 +45,15 @@ public function index() {
 
 	}
 
-	public function category($id, $name = "", $order = "votes", $type = "desc", $page = '1')
-    {
-        if(!$this->get->categoryExists($id)){
+	public function category($id, $name = "", $order = "votes", $type = "desc", $page = '1') {
+        if (!$this->get->categoryExists($id)){
             header('Location: ' . base_url() . 'home');
             return;
         }
+
+        $data = $this->getDefaultData();
         $data['ideas'] = $this->get->getIdeasByCategory($id, $order, $type, $page);
-        $data['categories'] = $this->get->getCategories();
         $data['category'] = $data['categories'][$id];
-        $data['title'] = $this->get->getSetting('title');
         $total = $this->get->getQuantityOfApprovedIdeas($id);
         $data['max_results'] = (int) $this->get->getSetting('max_results');
         $data['page'] = (int) $page;
@@ -62,8 +62,6 @@ public function category($id, $name = "", $order = "votes", $type = "desc", $pag
         $data['type'] = $type;
         $data['order'] = $order;
 
-        $data['lang'] = $this->lang->language;
-
         $this->load->view('_templates/header', $data);
 		$this->load->view('home/category_ideas', $data);
 		$this->load->view('_templates/menu', $data);
@@ -71,12 +69,10 @@ public function category($id, $name = "", $order = "votes", $type = "desc", $pag
     }
 
     public function search() {
+        $data = $this->getDefaultData();
+
         $query = $this->input->post('query');
         $data['ideas'] = $this->get->getIdeasBySearchQuery($query);
-        $data['categories'] = $this->get->getCategories();
-        $data['title'] = $this->get->getSetting('title');
-
-        $data['lang'] = $this->lang->language;
 
         $this->load->view('_templates/header', $data);
 		$this->load->view('home/search_results', $data);
@@ -95,17 +91,16 @@ public function idea($id) {
         $ideaUserName = $this->get->getUser($idea->authorid)->name;
         $idea->user = $ideaUserName;
         $comments = $this->get->getCommentsByIdea($id);
+
         foreach($comments as $comment){
             $userName = $this->get->getUser($comment->userid)->name;
             $comment->user = $userName;
         }
-        $data['title'] = $this->get->getSetting('title');
+
+        $data = $this->getDefaultData();
         $data['comments'] = $comments;
-        $data['categories'] = $this->get->getCategories();
         $data['idea'] = $idea;
 
-        $data['lang'] = $this->lang->language;
-
         $this->load->view('_templates/header', $data);
 		$this->load->view('home/view_idea', $data);
 		$this->load->view('_templates/menu', $data);
@@ -114,24 +109,25 @@ public function idea($id) {
 
 
     public function profile($id, $error=0) {
+        $data = $this->getDefaultData();
+
         $data['user'] = $this->get->getUser($id);
-        if($data['user'] === false){
+
+        if ($data['user'] === false) {
             header('Location: ' . base_url() . 'home');
             return;
         }
+
         $data['logs'] = $this->get->get_logs('user', $id);
         $data['comments'] = $this->get->getUserComments($id, 20);
-        $data['categories'] = $this->get->getCategories();
         $data['ideas'] = $this->get->getUserIdeas($id);
-        $data['title'] = $this->get->getSetting('title');
+
 
         $data['error'] = $this->input->post('error', true);
         if(@isset($_SESSION['phpback_userid']) && $data['user']->id == $_SESSION['phpback_userid']){
             $data['votes'] = $this->get->getUserVotes($_SESSION['phpback_userid']);
         }
 
-        $data['lang'] = $this->lang->language;
-
         $this->load->view('_templates/header', $data);
 		$this->load->view('home/user', $data);
 		$this->load->view('_templates/menu', $data);
@@ -156,13 +152,10 @@ public function login($error = "NULL", $ban=0) {
             return;
         }
 
-        $data['categories'] = $this->get->getCategories();
-        $data['title'] = $this->get->getSetting('title');
+        $data = $this->getDefaultData();
         $data['error'] = $error;
         $data['ban'] = $ban;
 
-        $data['lang'] = $this->lang->language;
-
         $this->load->view('_templates/header', $data);
 		$this->load->view('home/login', $data);
 		$this->load->view('_templates/menu', $data);
@@ -170,8 +163,7 @@ public function login($error = "NULL", $ban=0) {
     }
 
     public function postidea($error = "none") {
-        $data['categories'] = $this->get->getCategories();
-        $data['title'] = $this->get->getSetting('title');
+        $data = $this->getDefaultData();
         $data['error'] = $error;
         $data['POST'] = array(
 					'title' => $this->input->post('title'),
@@ -179,8 +171,6 @@ public function postidea($error = "none") {
 					'desc' => $this->input->post('desc')
 				);
 
-        $data['lang'] = $this->lang->language;
-
         $this->load->view('_templates/header', $data);
         $this->load->view('home/post_idea', $data);
         $this->load->view('_templates/menu', $data);
@@ -188,20 +178,24 @@ public function postidea($error = "none") {
     }
 
     public function register($error = "NULL") {
-
+        $data = $this->getDefaultData();
         $data['recaptchapublic'] = $this->get->getSetting('recaptchapublic');
-        $data['categories'] = $this->get->getCategories();
-        $data['title'] = $this->get->getSetting('title');
         $data['error'] = $error;
 
-        $data['lang'] = $this->lang->language;
-
         $this->load->view('_templates/header', $data);
 		$this->load->view('home/register', $data);
 		$this->load->view('_templates/menu', $data);
 		$this->load->view('_templates/footer', $data);
     }
 
+    private function getDefaultData() {
+        return array(
+            'title' => $this->get->getSetting('title'),
+            'categories' => $this->get->getCategories(),
+            'lang' => $this->lang->language,
+        );
+    }
+
     private function verifyBanning() {
         if (@isset($_SESSION['phpback_userid']) && ($ban = $this->get->getBanValue($_SESSION['phpback_userid'])) != 0) {
             date_default_timezone_set('America/Los_Angeles');
diff --git a/application/language/bahasa indonesia/default_lang.php b/application/language/bahasa indonesia/default_lang.php
index ee6b0a5c..8383e2a4 100644
--- a/application/language/bahasa indonesia/default_lang.php	
+++ b/application/language/bahasa indonesia/default_lang.php	
@@ -13,6 +13,7 @@
     $lang['label_delete_votes'] = 'Hapus voting';
     $lang['label_description'] = 'Deskripsi';
     $lang['label_idea'] = 'Ide';
+    $lang['label_idea_approve'] = 'Setujui ide';
     $lang['label_idea_title'] = 'Judul ide';
     $lang['label_ideas'] = 'Ide';
     $lang['label_log'] = 'Log';
diff --git a/application/language/bahasa indonesia/log_lang.php b/application/language/bahasa indonesia/log_lang.php
index 6db212a4..b3f8fd92 100644
--- a/application/language/bahasa indonesia/log_lang.php	
+++ b/application/language/bahasa indonesia/log_lang.php	
@@ -16,3 +16,5 @@
     $lang['log_category_description'] = 'deskripsi telah diperbarui';
     $lang['log_category_changed'] = 'Kategori \'%s1\' diubah ke \'%s2\'';
     $lang['log_category_deleted'] = 'Kategori %s dihapus';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/language/chinese/default_lang.php b/application/language/chinese/default_lang.php
new file mode 100644
index 00000000..dba135c9
--- /dev/null
+++ b/application/language/chinese/default_lang.php
@@ -0,0 +1,78 @@
+<?php
+    $lang['label_activity'] = '活动';
+    $lang['label_ban_user'] = '用户禁言';
+    $lang['label_categories'] = '分类';
+    $lang['label_category'] = '分类';
+    $lang['label_change_password'] = '修改密码';
+    $lang['label_change_status'] = '变更状态';
+    $lang['label_commented'] = '评论';
+    $lang['label_comments'] = '评论';
+    $lang['label_date'] = '日期';
+    $lang['label_delete_comment'] = '删除';
+    $lang['label_delete_idea'] = '删除';
+    $lang['label_delete_votes'] = '删除';
+    $lang['label_description'] = '描述';
+    $lang['label_idea'] = '想法';
+    $lang['label_idea_approve'] = '同意';
+    $lang['label_idea_title'] = '标题';
+    $lang['label_ideas'] = '想法';
+    $lang['label_log'] = '日志';
+    $lang['label_log_in'] = '登陆';
+    $lang['label_log_out'] = '退出';
+    $lang['label_logged_as'] = '登陆为';
+    $lang['label_post_new_idea'] = '提交新的想法';
+    $lang['label_profiles'] = '简介';
+    $lang['label_registration'] = '注册';
+    $lang['label_registration_form'] = '登记表';
+    $lang['label_reset_votes'] = '重置投票';
+    $lang['label_search'] = '搜索';
+    $lang['label_sign_in'] = '签到';
+    $lang['label_submit'] = '提交';
+    $lang['label_vote'] = '投票';
+    $lang['label_votes'] = '投票';
+
+    $lang['text_shared_this_idea'] = '分享想法';
+    $lang['text_flag_comment'] = '标记评论';
+    $lang['text_create_an_account'] = 'Or 创建账号';
+    $lang['text_registration_success'] = '注册成功';
+    $lang['text_select_category'] = '选择分类...';
+    $lang['text_nothing_found'] = '什么都没找到...';
+    $lang['text_votes_left'] = '剩余票数.';
+    $lang['text_sure_delete_idea'] = '确定要删除该想法吗?';
+    $lang['text_sure_delete_comment'] = '确定要删除该评论?';
+
+    $lang['idea_completed'] = '完成';
+    $lang['idea_started'] = '开始';
+    $lang['idea_planned'] = '计划';
+    $lang['idea_considered'] = '讨论';
+    $lang['idea_declined'] = '拒绝';
+    $lang['idea_new'] = '审查中';
+
+    $lang['last_completed_ideas'] = '最近完成';
+    $lang['last_started_ideas'] = '最近开始';
+    $lang['last_planned_ideas'] = '最近计划';
+    $lang['last_considered_ideas'] = '最近讨论';
+
+    $lang['form_remember'] = '记住';
+    $lang['form_full_name'] = '全名';
+    $lang['form_email'] = '邮箱号';
+    $lang['form_password'] = '密码';
+    $lang['form_repeat_password'] = '重置密码';
+    $lang['form_password_old'] = '旧密码';
+    $lang['form_password_new'] = '新密码';
+    $lang['from_password_new_repeat'] = '重复密码';
+
+    $lang['error_login_to_post'] = '你必须登陆才能提交新想法';
+    $lang['error_login'] = '无效的邮箱号或密码';
+    $lang['error_recaptcha'] = '无效的验证码';
+    $lang['error_name'] = '无效的名称';
+    $lang['error_email'] = '无效的邮箱号';
+    $lang['error_password'] = '密码必须大于6个字符';
+    $lang['error_password_old'] = '旧密码错误';
+    $lang['error_passwords'] = '密码不匹配';
+    $lang['error_email_exists'] = '邮箱号已存在';
+    $lang['error_banned'] = '你已经被禁止了％s天';
+    $lang['error_banned_inf'] = '你被无限期地禁止';
+    $lang['error_title'] = '标题太短了';
+    $lang['error_category'] = '请选择一个分类';
+    $lang['error_description'] = '描述太短了';
diff --git a/application/language/chinese/index.html b/application/language/chinese/index.html
new file mode 100755
index 00000000..c942a79c
--- /dev/null
+++ b/application/language/chinese/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/application/language/chinese/log_lang.php b/application/language/chinese/log_lang.php
new file mode 100644
index 00000000..4e5ad378
--- /dev/null
+++ b/application/language/chinese/log_lang.php
@@ -0,0 +1,20 @@
+<?php
+    $lang['log_commented'] = '想法 %s 完成';
+    $lang['log_comment_deleted'] = '删除评论 %s';
+    $lang['log_idea_approved'] = '同意想法 %s';
+    $lang['log_idea_deleted'] = '删除想法 %s';
+    $lang['log_idea_status'] = '状态从 %s1 变更到 %s2';
+    $lang['log_user_registered'] = '用户已经注册';
+    $lang['log_new_idea'] = '新的想法已经创建';
+    $lang['log_idea_voted'] = '想法 %s1 收到 %s2 投票';
+    $lang['log_user_banned'] = '禁止 %s1 用户 %s2 天';
+    $lang['log_user_was_banned'] = '用户 %s 被禁止';
+    $lang['log_user_unbanned'] = '解除禁止 %s';
+    $lang['log_settings'] = '配置已经修改';
+    $lang['log_user_admin'] = '用户被变更为管理员';
+    $lang['log_category_created'] = '分类已创建';
+    $lang['log_category_description'] = '修改了描述';
+    $lang['log_category_changed'] = '分类 \'%s1\' 变更为 \'%s2\'';
+    $lang['log_category_deleted'] = '分类 %s 删除了';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/language/dutch/default_lang.php b/application/language/dutch/default_lang.php
new file mode 100644
index 00000000..8090af6a
--- /dev/null
+++ b/application/language/dutch/default_lang.php
@@ -0,0 +1,78 @@
+<?php
+    $lang['label_activity'] = 'Activiteit';
+    $lang['label_ban_user'] = 'Blokkeer gebruiker';
+    $lang['label_categories'] = 'Categorieën';
+    $lang['label_category'] = 'Categorie';
+    $lang['label_change_password'] = 'Wijzig wachtwoord';
+    $lang['label_change_status'] = 'Wijzig status';
+    $lang['label_commented'] = 'Gereageerd op';
+    $lang['label_comments'] = 'Reactie';
+    $lang['label_date'] = 'Datum';
+    $lang['label_delete_comment'] = 'Verwijder reactie';
+    $lang['label_delete_idea'] = 'Verwijder idee';
+    $lang['label_delete_votes'] = 'Verwijder stemmen';
+    $lang['label_description'] = 'Omschrijving';
+    $lang['label_idea'] = 'Idee';
+    $lang['label_idea_approve'] = 'Goedkeuring idee';
+    $lang['label_idea_title'] = 'Idee titel';
+    $lang['label_ideas'] = 'Ideeën';
+    $lang['label_log'] = 'Log';
+    $lang['label_log_in'] = 'Inloggen';
+    $lang['label_log_out'] = 'Uitloggn';
+    $lang['label_logged_as'] = 'Logged als';
+    $lang['label_post_new_idea'] = 'Nieuw idee toevoegen';
+    $lang['label_profiles'] = 'Profielen';
+    $lang['label_registration'] = 'Registeren';
+    $lang['label_registration_form'] = 'Registratieformulier';
+    $lang['label_reset_votes'] = 'Stemmen resetten';
+    $lang['label_search'] = 'Zoek';
+    $lang['label_sign_in'] = 'Inloggen';
+    $lang['label_submit'] = 'Versturen';
+    $lang['label_vote'] = 'Stem';
+    $lang['label_votes'] = 'Stemmen';
+
+    $lang['text_shared_this_idea'] = 'heeft dit idee gedeeld';
+    $lang['text_flag_comment'] = 'flag reactie';
+    $lang['text_create_an_account'] = 'Of maak een profiel';
+    $lang['text_registration_success'] = 'Registratie geslaagd';
+    $lang['text_select_category'] = 'Selecteer een categorie...';
+    $lang['text_nothing_found'] = 'Niets gevonden...';
+    $lang['text_votes_left'] = 'stemmen resterend.';
+    $lang['text_sure_delete_idea'] = 'Weet je zeker dat je dit idee wilt verwijderen?';
+    $lang['text_sure_delete_comment'] = 'Weet je zeker dat je deze reactie wilt verwijderen?';
+
+    $lang['idea_completed'] = 'Voltooid';
+    $lang['idea_started'] = 'Gestard';
+    $lang['idea_planned'] = 'Ingepland';
+    $lang['idea_considered'] = 'In behandeling';
+    $lang['idea_declined'] = 'Afgewezen';
+    $lang['idea_new'] = 'Wordt beoordeeld';
+
+    $lang['last_completed_ideas'] = 'Meest recent voltooide ideeën';
+    $lang['last_started_ideas'] = 'Meest recent gestarte ideeën';
+    $lang['last_planned_ideas'] = 'Meest recent ingeplande ideeën';
+    $lang['last_considered_ideas'] = 'Meest recent behandelde ideeën';
+
+    $lang['form_remember'] = 'Onthoudt mij';
+    $lang['form_full_name'] = 'Volledige naam';
+    $lang['form_email'] = 'E-mailadres';
+    $lang['form_password'] = 'Wachtwoord';
+    $lang['form_repeat_password'] = 'Herhaal Wachtwoord';
+    $lang['form_password_old'] = 'Huidig Wachtwoord';
+    $lang['form_password_new'] = 'Nieuw Wachtwoord';
+    $lang['from_password_new_repeat'] = 'Herhaal nieuw wachtwoord';
+
+    $lang['error_login_to_post'] = 'Je moet ingelogd om een nieuw idee te plaatsen';
+    $lang['error_login'] = 'Ongeldig wachtwoord of e-mail';
+    $lang['error_recaptcha'] = 'Foute Recaptcha code';
+    $lang['error_name'] = 'Ongeldige naam';
+    $lang['error_email'] = 'Ongeldig E-mailadres';
+    $lang['error_password'] = 'Wachtwoord dient uit mnimaal 6 karakters te bestaan';
+    $lang['error_password_old'] = 'Huidig wachtwoord is verkeerd';
+    $lang['error_passwords'] = 'Wachtwoorden komen niet overeen';
+    $lang['error_email_exists'] = 'E-mailadres is al geregistreerd';
+    $lang['error_banned'] = 'Je bent geblokkeert voor %s dagen';
+    $lang['error_banned_inf'] = 'Je bent permanent geblokkeerd';
+    $lang['error_title'] = 'Titel is te kort';
+    $lang['error_category'] = 'Selecteer een categorie';
+    $lang['error_description'] = 'Omschrijving is te kort';
diff --git a/application/language/dutch/index.html b/application/language/dutch/index.html
new file mode 100755
index 00000000..c942a79c
--- /dev/null
+++ b/application/language/dutch/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/application/language/dutch/log_lang.php b/application/language/dutch/log_lang.php
new file mode 100644
index 00000000..546ce557
--- /dev/null
+++ b/application/language/dutch/log_lang.php
@@ -0,0 +1,20 @@
+<?php
+    $lang['log_commented'] = 'Ideeë %s met reacties';
+    $lang['log_comment_deleted'] = 'Verwijderde reacties %s';
+    $lang['log_idea_approved'] = 'Goedgekeurde ideeën %s';
+    $lang['log_idea_deleted'] = 'Verwijderde ideeën %s';
+    $lang['log_idea_status'] = 'Status gewijzigd idee %s1 naar %s2';
+    $lang['log_user_registered'] = 'Gebruiker geregistreerd';
+    $lang['log_new_idea'] = 'Niew idee toegevoegd';
+    $lang['log_idea_voted'] = 'Idee %s1 heeft %s2 stemmen';
+    $lang['log_user_banned'] = 'Gebruiker %s1 voor %s2 dagen geblokkeerd';
+    $lang['log_user_was_banned'] = 'Gebruiker %s is geblokkeerd';
+    $lang['log_user_unbanned'] = 'Blokkade opgeheven voor gebruiker %s';
+    $lang['log_settings'] = 'Instellingen zijn opgeslagen';
+    $lang['log_user_admin'] = 'Gebruiker is nu admnistrator';
+    $lang['log_category_created'] = 'categorie is aangemaakt';
+    $lang['log_category_description'] = 'omschrijving is gewijzigd';
+    $lang['log_category_changed'] = 'Categorie \'%s1\' gewijzigd in \'%s2\'';
+    $lang['log_category_deleted'] = 'Categorie %s verwijderd';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/language/english/default_lang.php b/application/language/english/default_lang.php
index 56801fd1..fac68765 100644
--- a/application/language/english/default_lang.php
+++ b/application/language/english/default_lang.php
@@ -13,12 +13,13 @@
     $lang['label_delete_votes'] = 'Delete votes';
     $lang['label_description'] = 'Description';
     $lang['label_idea'] = 'Idea';
+    $lang['label_idea_approve'] = 'Approve idea';
     $lang['label_idea_title'] = 'Idea title';
     $lang['label_ideas'] = 'Ideas';
     $lang['label_log'] = 'Log';
     $lang['label_log_in'] = 'Log in';
     $lang['label_log_out'] = 'Log out';
-    $lang['label_logged_as'] = 'Logged as';
+    $lang['label_logged_as'] = 'Logged in as';
     $lang['label_post_new_idea'] = 'Post a new idea';
     $lang['label_profiles'] = 'Profiles';
     $lang['label_registration'] = 'Register';
diff --git a/application/language/english/log_lang.php b/application/language/english/log_lang.php
index 964495aa..e6d2b9f3 100644
--- a/application/language/english/log_lang.php
+++ b/application/language/english/log_lang.php
@@ -16,3 +16,5 @@
     $lang['log_category_description'] = 'description was updated';
     $lang['log_category_changed'] = 'Category \'%s1\' changed to \'%s2\'';
     $lang['log_category_deleted'] = 'Category %s deleted';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/language/french/default_lang.php b/application/language/french/default_lang.php
index c04adc85..4e088a62 100644
--- a/application/language/french/default_lang.php
+++ b/application/language/french/default_lang.php
@@ -8,11 +8,12 @@
 $lang['label_commented'] = 'Commentaires dans';
 $lang['label_comments'] = 'Commentaires';
 $lang['label_date'] = 'Date';
-$lang['label_delete_comment'] = 'Commentaire supprimé';
-$lang['label_delete_idea'] = 'Idée supprimée';
-$lang['label_delete_votes'] = 'Votes supprimés';
+$lang['label_delete_comment'] = 'Supprimer commentaire';
+$lang['label_delete_idea'] = 'Supprimer idée';
+$lang['label_delete_votes'] = 'Supprimer votes';
 $lang['label_description'] = 'Description';
 $lang['label_idea'] = 'Idée';
+$lang['label_idea_approve'] = 'Approuver idée';
 $lang['label_idea_title'] = 'Titre de l\'idée';
 $lang['label_ideas'] = 'Idées';
 $lang['label_log'] = 'Log';
diff --git a/application/language/french/log_lang.php b/application/language/french/log_lang.php
index 1ad1a8ef..01f3b7a2 100644
--- a/application/language/french/log_lang.php
+++ b/application/language/french/log_lang.php
@@ -16,3 +16,5 @@
     $lang['log_category_description'] = 'la description a été mise à jour';
     $lang['log_category_changed'] = 'Catégorie \'%s1\' modifiée pour \'%s2\'';
     $lang['log_category_deleted'] = 'Catégorie %s supprimée';
+    $lang['log_new_idea_mail_content'] = 'Une nouvelle idée a été postée dans votre système de feedback %s. Pour la retrouver, veuillez cliquer sur le lien suivant : %s.';
+    $lang['log_new_comment_mail_content'] = 'Un nouveau commentaire a été posté dans votre système de feedback %s. Pour le retrouver, veuillez vous rendre sur le lien suivant : %s.';
diff --git a/application/language/german/default_lang.php b/application/language/german/default_lang.php
new file mode 100644
index 00000000..e6272654
--- /dev/null
+++ b/application/language/german/default_lang.php
@@ -0,0 +1,78 @@
+<?php
+    $lang['label_activity'] = 'Aktivität';
+    $lang['label_ban_user'] = 'Benutzer sperren';
+    $lang['label_categories'] = 'Kategorien';
+    $lang['label_category'] = 'Kategorie';
+    $lang['label_change_password'] = 'Kennwort ändern';
+    $lang['label_change_status'] = 'Status ändern';
+    $lang['label_commented'] = 'Kommentiert in';
+    $lang['label_comments'] = 'Kommentare';
+    $lang['label_date'] = 'Datum';
+    $lang['label_delete_comment'] = 'Kommentar löschen';
+    $lang['label_delete_idea'] = 'Idee löschen';
+    $lang['label_delete_votes'] = 'Stimme löschen';
+    $lang['label_description'] = 'Beschreibung';
+    $lang['label_idea'] = 'Idee';
+    $lang['label_idea_title'] = 'Ideentitel';
+    $lang['label_idea_approve'] = 'Idee freigeben';
+    $lang['label_ideas'] = 'Ideen';
+    $lang['label_log'] = 'Protokoll';
+    $lang['label_log_in'] = 'Anmelden';
+    $lang['label_log_out'] = 'Abmelden';
+    $lang['label_logged_as'] = 'Angemeldet als';
+    $lang['label_post_new_idea'] = 'Neue Idee';
+    $lang['label_profiles'] = 'Profile';
+    $lang['label_registration'] = 'Registrieren';
+    $lang['label_registration_form'] = 'Registrierungsformular';
+    $lang['label_reset_votes'] = 'Stimmen zurücksetzen';
+    $lang['label_search'] = 'Suchen';
+    $lang['label_sign_in'] = 'Anmelden';
+    $lang['label_submit'] = 'Übermitteln';
+    $lang['label_vote'] = 'Wählen';
+    $lang['label_votes'] = 'Stimmen';
+
+    $lang['text_shared_this_idea'] = 'Idee teilen';
+    $lang['text_flag_comment'] = 'Kommentar markieren';
+    $lang['text_create_an_account'] = 'Zugang erstellen';
+    $lang['text_registration_success'] = 'Registrierung erfolgreich';
+    $lang['text_select_category'] = 'Kategorie wählen...';
+    $lang['text_nothing_found'] = 'Kein Ergebnis...';
+    $lang['text_votes_left'] = 'verbleibende Stimmen.';
+    $lang['text_sure_delete_idea'] = 'Sind Sie sicher, das Sie diese Idee löschen wollen?';
+    $lang['text_sure_delete_comment'] = 'Sind Sie sicher, das Sie diesen Kommentar löschen wollen?';
+
+    $lang['idea_completed'] = 'Fertiggestellt';
+    $lang['idea_started'] = 'Begonnen';
+    $lang['idea_planned'] = 'Geplant';
+    $lang['idea_considered'] = 'In Betracht gezogen';
+    $lang['idea_declined'] = 'Abgelehnt';
+    $lang['idea_new'] = 'in Prüfung';
+
+    $lang['last_completed_ideas'] = 'Fertiggestellte Ideen';
+    $lang['last_started_ideas'] = 'Angefangene Ideen';
+    $lang['last_planned_ideas'] = 'Geplante Ideen';
+    $lang['last_considered_ideas'] = 'In Betracht gezogene Ideen';
+
+    $lang['form_remember'] = 'Erinnerung';
+    $lang['form_full_name'] = 'Vollständiger Name';
+    $lang['form_email'] = 'E-Mail Adresse';
+    $lang['form_password'] = 'Kennwort';
+    $lang['form_repeat_password'] = 'Kennwort wiederholen';
+    $lang['form_password_old'] = 'Altes Kennwort';
+    $lang['form_password_new'] = 'Neues Kennwort';
+    $lang['from_password_new_repeat'] = 'Neues Kennwort wiederholen';
+
+    $lang['error_login_to_post'] = 'Sie müssen sich anmelden, um eine neue Idee zu speichern';
+    $lang['error_login'] = 'Ungültiges Kennwort oder E-Mail Adresse';
+    $lang['error_recaptcha'] = 'Ungültiger Recaptcha Code';
+    $lang['error_name'] = 'Ungültiger Name';
+    $lang['error_email'] = 'Ungültige E-Mail';
+    $lang['error_password'] = 'Das Kennwort muss mindestens 6 Zeichen haben';
+    $lang['error_password_old'] = 'Altes Kennwort ist falsch';
+    $lang['error_passwords'] = 'Kennwörter stimmen nicht überein';
+    $lang['error_email_exists'] = 'E-Mail existiert schon';
+    $lang['error_banned'] = 'Sie wurden für %s Tage gesperrt';
+    $lang['error_banned_inf'] = 'Sie wurden für immer gesperrt!';
+    $lang['error_title'] = 'Titel ist zu kurz';
+    $lang['error_category'] = 'Wählen Sie eine Kategorie';
+    $lang['error_description'] = 'Beschreibung ist zu kurz';
diff --git a/application/language/german/index.html b/application/language/german/index.html
new file mode 100644
index 00000000..e3cc5fec
--- /dev/null
+++ b/application/language/german/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Verboten</title>
+</head>
+<body>
+
+<p>Verzeichniszugriff ist verboten.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/application/language/german/log_lang.php b/application/language/german/log_lang.php
new file mode 100644
index 00000000..a71218a9
--- /dev/null
+++ b/application/language/german/log_lang.php
@@ -0,0 +1,20 @@
+<?php
+    $lang['log_commented'] = 'Idee %s kommentiert';
+    $lang['log_comment_deleted'] = 'Kommentar gelöscht %s';
+    $lang['log_idea_approved'] = 'Idee genehmigt %s';
+    $lang['log_idea_deleted'] = 'Gelöschte Idee %s';
+    $lang['log_idea_status'] = 'Statuswechsel von Idee %s1 zu %s2';
+    $lang['log_user_registered'] = 'Benutzer registriert';
+    $lang['log_new_idea'] = 'Neue Idee erstellt';
+    $lang['log_idea_voted'] = 'Idee %s1 gewählt mit %s2 Stimmen';
+    $lang['log_user_banned'] = 'Gesperrter Nutzer %s1 für %s2 Tage';
+    $lang['log_user_was_banned'] = 'Nutzer %s wurde gesperrt';
+    $lang['log_user_unbanned'] = 'Sperrung aufgehoben für Nutzer %s';
+    $lang['log_settings'] = 'Einstellung wurden bearbeitet';
+    $lang['log_user_admin'] = 'Nutzer wurde zum Administrator befördert';
+    $lang['log_category_created'] = 'Kategorie wurde erstellt';
+    $lang['log_category_description'] = 'Beschreibung wurde aktualisiert';
+    $lang['log_category_changed'] = 'Kategorie \'%s1\' geändert zu \'%s2\'';
+    $lang['log_category_deleted'] = 'Kategorie %s gelöscht';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/language/japanese/default_lang.php b/application/language/japanese/default_lang.php
new file mode 100644
index 00000000..032561ce
--- /dev/null
+++ b/application/language/japanese/default_lang.php
@@ -0,0 +1,78 @@
+<?php
+    $lang['label_activity'] = 'アクティビティ';
+    $lang['label_ban_user'] = 'ユーザーをBAN';
+    $lang['label_categories'] = 'カテゴリー';
+    $lang['label_category'] = 'カテゴリー';
+    $lang['label_change_password'] = 'パスワードを変更する';
+    $lang['label_change_status'] = 'ステータスを変更する';
+    $lang['label_commented'] = 'コメントした';
+    $lang['label_comments'] = 'コメント';
+    $lang['label_date'] = '日付';
+    $lang['label_delete_comment'] = 'コメントを削除する';
+    $lang['label_delete_idea'] = 'アイデアを削除';
+    $lang['label_delete_votes'] = '投票を削除する';
+    $lang['label_description'] = '説明';
+    $lang['label_idea'] = 'アイデア';
+    $lang['label_idea_approve'] = 'アイデアを承認';
+    $lang['label_idea_title'] = 'アイデアタイトル';
+    $lang['label_ideas'] = 'アイデア';
+    $lang['label_log'] = 'ログ';
+    $lang['label_log_in'] = 'ログイン';
+    $lang['label_log_out'] = 'ログアウト';
+    $lang['label_logged_as'] = 'ログインユーザー：';
+    $lang['label_post_new_idea'] = '新しいアイデアを投稿する';
+    $lang['label_profiles'] = 'プロフィール';
+    $lang['label_registration'] = '登録';
+    $lang['label_registration_form'] = '登録フォーム';
+    $lang['label_reset_votes'] = '投票をリセットする';
+    $lang['label_search'] = '検索';
+    $lang['label_sign_in'] = 'サインイン';
+    $lang['label_submit'] = '送信';
+    $lang['label_vote'] = '投票';
+    $lang['label_votes'] = '投票';
+
+    $lang['text_shared_this_idea'] = 'この考えを共有しました';
+    $lang['text_flag_comment'] = 'flag comment';
+    $lang['text_create_an_account'] = 'アカウントの新規作成';
+    $lang['text_registration_success'] = '登録完了';
+    $lang['text_select_category'] = 'カテゴリを選択……';
+    $lang['text_nothing_found'] = '何も見つかりませんでした……';
+    $lang['text_votes_left'] = 'votes left.';
+    $lang['text_sure_delete_idea'] = 'このアイデアを削除してもよろしいですか？';
+    $lang['text_sure_delete_comment'] = 'このコメントを削除してもよろしいですか？';
+
+    $lang['idea_completed'] = '完了';
+    $lang['idea_started'] = '着手';
+    $lang['idea_planned'] = '計画中';
+    $lang['idea_considered'] = '検討中';
+    $lang['idea_declined'] = '断念';
+    $lang['idea_new'] = 'レビュー中';
+
+    $lang['last_completed_ideas'] = '最後に完了したアイデア';
+    $lang['last_started_ideas'] = '最後に着手したアイデア';
+    $lang['last_planned_ideas'] = '最後に計画したアイデア';
+    $lang['last_considered_ideas'] = '最後に考えられたアイデア';
+
+    $lang['form_remember'] = '入力を覚えさせる';
+    $lang['form_full_name'] = 'フルネーム';
+    $lang['form_email'] = 'メールアドレス';
+    $lang['form_password'] = 'パスワード';
+    $lang['form_repeat_password'] = 'パスワードをもう一度';
+    $lang['form_password_old'] = '旧パスワード';
+    $lang['form_password_new'] = '新パスワード';
+    $lang['from_password_new_repeat'] = '新パスワードをもう一度';
+
+    $lang['error_login_to_post'] = 'あなたは新しいアイデアを投稿するためにログインする必要があります';
+    $lang['error_login'] = 'メールアドレスまたはパスワードが無効です';
+    $lang['error_recaptcha'] = 'Recaptchaコードが無効です';
+    $lang['error_name'] = '無効な名前';
+    $lang['error_email'] = '無効なメールアドレス';
+    $lang['error_password'] = 'パスワードは最低6文字以上でなければいけません。';
+    $lang['error_password_old'] = '旧パスワードが誤っています';
+    $lang['error_passwords'] = 'パスワードが一致しません';
+    $lang['error_email_exists'] = 'このメールアドレスは登録済です';
+    $lang['error_banned'] = 'あなたのアカウントは %s 日間制限されています。';
+    $lang['error_banned_inf'] = 'あなたのアカウントは無期限停止です';
+    $lang['error_title'] = 'タイトルが短過ぎます';
+    $lang['error_category'] = 'カテゴリを選択してください';
+    $lang['error_description'] = '説明が短すぎます';
diff --git a/application/language/japanese/index.html b/application/language/japanese/index.html
new file mode 100755
index 00000000..c942a79c
--- /dev/null
+++ b/application/language/japanese/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/application/language/japanese/log_lang.php b/application/language/japanese/log_lang.php
new file mode 100644
index 00000000..52eb8275
--- /dev/null
+++ b/application/language/japanese/log_lang.php
@@ -0,0 +1,20 @@
+<?php
+    $lang['log_commented'] = 'アイデア %s にコメント';
+    $lang['log_comment_deleted'] = 'コメント %s を削除';
+    $lang['log_idea_approved'] = 'アイデア %s を承認';
+    $lang['log_idea_deleted'] = 'アイデア %s を削除';
+    $lang['log_idea_status'] = 'アイデア %s1 のステータスを %s2 に変更';
+    $lang['log_user_registered'] = 'ユーザーを登録';
+    $lang['log_new_idea'] = '新しいアイデアを作成';
+    $lang['log_idea_voted'] = 'アイデア %s1 に %s2 票投じられました';
+    $lang['log_user_banned'] = 'ユーザー「%s1」を %s2 日間BANします';
+    $lang['log_user_was_banned'] = 'ユーザー「%s」はBANされています';
+    $lang['log_user_unbanned'] = 'ユーザー「%s」のBAN状態を解除しました';
+    $lang['log_settings'] = '設定が変更されました';
+    $lang['log_user_admin'] = 'ユーザーが管理者に更新されました';
+    $lang['log_category_created'] = 'カテゴリが作成されました';
+    $lang['log_category_description'] = '説明が更新されました';
+    $lang['log_category_changed'] = 'カテゴリが「%s1」から「%s2」に変更されました';
+    $lang['log_category_deleted'] = '%s カテゴリを削除';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/language/persian/default_lang.php b/application/language/persian/default_lang.php
new file mode 100644
index 00000000..94a936a2
--- /dev/null
+++ b/application/language/persian/default_lang.php
@@ -0,0 +1,78 @@
+<?php
+    $lang['label_activity'] = 'فعالیت';
+    $lang['label_ban_user'] = 'مسدود کردن کاربر';
+    $lang['label_categories'] = 'دسته بندی ها';
+    $lang['label_category'] = 'دسته بندی';
+    $lang['label_change_password'] = 'ویرایش رمز عبور';
+    $lang['label_change_status'] = 'ویرایش وضعیت';
+    $lang['label_commented'] = 'نظر دادن در';
+    $lang['label_comments'] = 'نظر ها';
+    $lang['label_date'] = 'تاریخ';
+    $lang['label_delete_comment'] = 'پاک کردن نظر';
+    $lang['label_delete_idea'] = 'پاک کردن ایده';
+    $lang['label_delete_votes'] = 'حدف ارا';
+    $lang['label_description'] = 'توضیحات';
+    $lang['label_idea'] = 'نظر ';
+    $lang['label_idea_approve'] = 'تایید ایده';
+    $lang['label_idea_title'] = 'عنوان ایده';
+    $lang['label_ideas'] = 'ایده ها';
+    $lang['label_log'] = 'گزارش ها';
+    $lang['label_log_in'] = 'ورود';
+    $lang['label_log_out'] = 'خروج';
+    $lang['label_logged_as'] = 'وارد شده به عنوان';
+    $lang['label_post_new_idea'] = 'افزودن ایده جدید';
+    $lang['label_profiles'] = 'پروفایل';
+    $lang['label_registration'] = 'ثبت نام';
+    $lang['label_registration_form'] = 'فرم ثبت نام';
+    $lang['label_reset_votes'] = 'باز نشانی ارا';
+    $lang['label_search'] = 'جستجو';
+    $lang['label_sign_in'] = 'ورود';
+    $lang['label_submit'] = 'ارسال';
+    $lang['label_vote'] = 'رای دادن';
+    $lang['label_votes'] = 'ارا';
+
+    $lang['text_shared_this_idea'] = 'اشتراک گزاری این ایده';
+    $lang['text_flag_comment'] = 'پرچم کردن این نظر';
+    $lang['text_create_an_account'] = 'یا ساخت یک حساب کاربری';
+    $lang['text_registration_success'] = 'ثبت نام موفقیت امیز بود';
+    $lang['text_select_category'] = 'یک دسته بندی انتخاب کنید';
+    $lang['text_nothing_found'] = 'هیچ چیزی پیدا نشد';
+    $lang['text_votes_left'] = 'رای باقی مانده';
+    $lang['text_sure_delete_idea'] = 'آیا مطمئن هستید میخواهید این ایده را پاک کنید؟';
+    $lang['text_sure_delete_comment'] = 'آیا مطمئن هستید میخواهید این نظر را پاک کنید؟';
+
+    $lang['idea_completed'] = 'تکمیل شد';
+    $lang['idea_started'] = 'آغاز شده';
+    $lang['idea_planned'] = 'برنامه ریزی شده';
+    $lang['idea_considered'] = 'در نظر گرفته شده';
+    $lang['idea_declined'] = 'نپذیرفتن';
+    $lang['idea_new'] = 'درحال بازبینی';
+
+    $lang['last_completed_ideas'] = 'اخرین ایده های تکمیل شده';
+    $lang['last_started_ideas'] = 'اخرین ایده های شروع شده';
+    $lang['last_planned_ideas'] = 'اخرین ایده های برنامه ریزی شده';
+    $lang['last_considered_ideas'] = 'اخرین ایده های در نظر گرفته شده';
+
+    $lang['form_remember'] = 'مرا به خاطر بسپار';
+    $lang['form_full_name'] = 'نام و نام خانوادگی';
+    $lang['form_email'] = 'ادرس ایمیل';
+    $lang['form_password'] = 'رمزعبور';
+    $lang['form_repeat_password'] = 'تکرار رمز عبور';
+    $lang['form_password_old'] = 'رمز عبور قدیمی';
+    $lang['form_password_new'] = 'رمز عبور جدید';
+    $lang['from_password_new_repeat'] = 'رمز عبور جدید را دوباره وارد کنید';
+
+    $lang['error_login_to_post'] = 'برای ارسال ایده حتما باید وارد شوید';
+    $lang['error_login'] = 'رمز عبور یا ایمیل اشتباه است';
+    $lang['error_recaptcha'] = 'کد امنیتی نامعتبر میباشد';
+    $lang['error_name'] = 'نام نامعتبر است';
+    $lang['error_email'] = 'ایمیل نامعتبر است';
+    $lang['error_password'] = 'رمز عبور نمیتواند کمتر از ۶ کارکتر باشد';
+    $lang['error_password_old'] = 'رمز عبور قدیمی نادرست است';
+    $lang['error_passwords'] = 'رمز های عبور باهم یکسان نیستند';
+    $lang['error_email_exists'] = 'این ایمیل از قبل وجود دارد';
+    $lang['error_banned'] = 'شما برای %s مسدود شده اید';
+    $lang['error_banned_inf'] = 'دسترسی شما به صورت کامل مسدود شده است';
+    $lang['error_title'] = 'عنوان خیلی کوتاه است';
+    $lang['error_category'] = 'لطفا یک دسته بندی انتخاب کنید';
+    $lang['error_description'] = 'توضیحات ایده شما بسیار کوتاه است';
diff --git a/application/language/persian/index.html b/application/language/persian/index.html
new file mode 100755
index 00000000..c942a79c
--- /dev/null
+++ b/application/language/persian/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/application/language/persian/log_lang.php b/application/language/persian/log_lang.php
new file mode 100644
index 00000000..6fb8b55a
--- /dev/null
+++ b/application/language/persian/log_lang.php
@@ -0,0 +1,20 @@
+<?php
+    $lang['log_commented'] = 'ایده %s نظر داد';
+    $lang['log_comment_deleted'] = 'حذف نظر %s';
+    $lang['log_idea_approved'] = 'ایده تایید شد %s';
+    $lang['log_idea_deleted'] = 'ایده حذف شد %s';
+    $lang['log_idea_status'] = 'وضعیت ایده از %s1 به %s2 تعویض شد';
+    $lang['log_user_registered'] = 'کاربر ثبت نام کرد';
+    $lang['log_new_idea'] = 'ایده جدید ایجاد شد';
+    $lang['log_idea_voted'] = 'ایده %s1 رای داده شد با %s2 رای';
+    $lang['log_user_banned'] = 'کاربر %s1 مسدود شد برای %s2 روز';
+    $lang['log_user_was_banned'] = 'کاربر %s مسدود شده است';
+    $lang['log_user_unbanned'] = 'لغو مسدود بودن کاربر %s';
+    $lang['log_settings'] = 'تنظیمات ویرایش شده است';
+    $lang['log_user_admin'] = 'کاربر به مدیر تبدیل شده اشت';
+    $lang['log_category_created'] = 'دسته بندی جدید ایجاد شد';
+    $lang['log_category_description'] = 'توضیحات بروزرسانی شد';
+    $lang['log_category_changed'] = 'دسته بندی \'%s1\' به \'%s2\' ویرایش شد';
+    $lang['log_category_deleted'] = 'دسته بندی %s حذف شد';
+    $lang['log_new_idea_mail_content'] = 'ایده جدیدی در سیستم بازخورد شما %s ارسال شده است. برای یافتن آن ، روی پیوند زیر کلیک کنید: %s.';
+    $lang['log_new_comment_mail_content'] = 'نظر جدیدی در سیستم بازخورد شما %s ارسال شده است. برای یافتن آن ، روی پیوند زیر کلیک کنید: %s.';
diff --git a/application/language/portuguese-european/default_lang.php b/application/language/portuguese-european/default_lang.php
new file mode 100644
index 00000000..5a077dd9
--- /dev/null
+++ b/application/language/portuguese-european/default_lang.php
@@ -0,0 +1,78 @@
+<?php
+    $lang['label_activity'] = 'Actividade';
+    $lang['label_ban_user'] = 'Banir utilizador';
+    $lang['label_categories'] = 'Categorias';
+    $lang['label_category'] = 'Categoria';
+    $lang['label_change_password'] = 'Alterar Senha';
+    $lang['label_change_status'] = 'Mudar estado';
+    $lang['label_commented'] = 'Comentou em';
+    $lang['label_comments'] = 'Comentários';
+    $lang['label_date'] = 'Data';
+    $lang['label_delete_comment'] = 'Apagar comentário';
+    $lang['label_delete_idea'] = 'Apagar ideia';
+    $lang['label_delete_votes'] = 'Apagar votos';
+    $lang['label_description'] = 'Descrição';
+    $lang['label_idea'] = 'Ideia';
+    $lang['label_idea_approve'] = 'Aprovar Ideia';
+    $lang['label_idea_title'] = 'Título da Ideia';
+    $lang['label_ideas'] = 'Ideias';
+    $lang['label_log'] = 'Log';
+    $lang['label_log_in'] = 'Entrar';
+    $lang['label_log_out'] = 'Sair';
+    $lang['label_logged_as'] = 'Conectado como';
+    $lang['label_post_new_idea'] = 'Adicionar uma nova ideia';
+    $lang['label_profiles'] = 'Perfis';
+    $lang['label_registration'] = 'Registar';
+    $lang['label_registration_form'] = 'Formulário de Registo';
+    $lang['label_reset_votes'] = 'Limpar votos';
+    $lang['label_search'] = 'Pesquisar';
+    $lang['label_sign_in'] = 'Entrar';
+    $lang['label_submit'] = 'Enviar';
+    $lang['label_vote'] = 'Votar';
+    $lang['label_votes'] = 'Votos';
+
+    $lang['text_shared_this_idea'] = 'partilhou esta ideia';
+    $lang['text_flag_comment'] = 'marcar comentário';
+    $lang['text_create_an_account'] = 'Ou crie uma conta';
+    $lang['text_registration_success'] = 'Registo efectuado com sucesso';
+    $lang['text_select_category'] = 'Seleccione a categoria...';
+    $lang['text_nothing_found'] = 'Nada foi encontrado...';
+    $lang['text_votes_left'] = 'votos restantes.';
+    $lang['text_sure_delete_idea'] = 'Tem a certeza que deseja apagar esta ideia?';
+    $lang['text_sure_delete_comment'] = 'Tem a certeza que deseja apagar este comentário?';
+
+    $lang['idea_completed'] = 'Finalizada';
+    $lang['idea_started'] = 'Iniciada';
+    $lang['idea_planned'] = 'Planeada';
+    $lang['idea_considered'] = 'Considerada';
+    $lang['idea_declined'] = 'Recusada';
+    $lang['idea_new'] = 'Sob Revisão';
+
+    $lang['last_completed_ideas'] = 'Últimas Ideias Finalizadas';
+    $lang['last_started_ideas'] = 'Últimas Ideias Iniciadas';
+    $lang['last_planned_ideas'] = 'Últimas Ideias Planeadas';
+    $lang['last_considered_ideas'] = 'Últimas Ideias Consideradas';
+
+    $lang['form_remember'] = 'Manter-se conectado';
+    $lang['form_full_name'] = 'Nome completo';
+    $lang['form_email'] = 'Endereço de Email';
+    $lang['form_password'] = 'Senha';
+    $lang['form_repeat_password'] = 'Repetir Senha';
+    $lang['form_password_old'] = 'Senha anterior';
+    $lang['form_password_new'] = 'Nova senha';
+    $lang['from_password_new_repeat'] = 'Repetir nova senha';
+
+    $lang['error_login_to_post'] = 'Deve estar autenticado para adicionar uma nova ideia';
+    $lang['error_login'] = 'Email ou Senha inválido(s)';
+    $lang['error_recaptcha'] = 'Código de verificação inválido';
+    $lang['error_name'] = 'Nome inválido';
+    $lang['error_email'] = 'Email inválido';
+    $lang['error_password'] = 'A senha deve ter no mínimo 6 caracteres';
+    $lang['error_password_old'] = 'A senha anterior está errada';
+    $lang['error_passwords'] = 'As senhas não coincidem';
+    $lang['error_email_exists'] = 'Email já registado';
+    $lang['error_banned'] = 'Foi banido por %s dia(s)';
+    $lang['error_banned_inf'] = 'Foi banido indefinidamente';
+    $lang['error_title'] = 'Título muito curto';
+    $lang['error_category'] = 'Por favor, seleccione a categoria';
+    $lang['error_description'] = 'Descrição muito curta';
diff --git a/application/language/portuguese-european/index.html b/application/language/portuguese-european/index.html
new file mode 100644
index 00000000..2cbfe340
--- /dev/null
+++ b/application/language/portuguese-european/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Proibido</title>
+</head>
+<body>
+
+<p>O acesso a este directório foi-lhe negado.</p>
+
+</body>
+</html>
diff --git a/application/language/portuguese-european/log_lang.php b/application/language/portuguese-european/log_lang.php
new file mode 100644
index 00000000..01f2488e
--- /dev/null
+++ b/application/language/portuguese-european/log_lang.php
@@ -0,0 +1,20 @@
+<?php
+    $lang['log_commented'] = 'Ideia %s foi comentada';
+    $lang['log_comment_deleted'] = 'Remover comentário %s';
+    $lang['log_idea_approved'] = 'Ideia aprovada %s';
+    $lang['log_idea_deleted'] = 'Ideia removida %s';
+    $lang['log_idea_status'] = 'Alterado estado da ideia %s1 para %s2';
+    $lang['log_user_registered'] = 'Utilizador registado';
+    $lang['log_new_idea'] = 'Nova ideia criada';
+    $lang['log_idea_voted'] = 'Ideia %s1 votada com %s2 votos';
+    $lang['log_user_banned'] = 'Utilizador banido %s1 por %s2 dia(s)';
+    $lang['log_user_was_banned'] = 'Utilizador %s foi banido';
+    $lang['log_user_unbanned'] = 'Utilizador %s foi desbanido';
+    $lang['log_settings'] = 'Configurações foram editadas';
+    $lang['log_user_admin'] = 'Utilizador foi promovido a administrador';
+    $lang['log_category_created'] = 'categoria foi criada';
+    $lang['log_category_description'] = 'descrição foi actualizada';
+    $lang['log_category_changed'] = 'Categoria \'%s1\' alterada para \'%s2\'';
+    $lang['log_category_deleted'] = 'Categoria %s removida';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/language/portuguese/default_lang.php b/application/language/portuguese/default_lang.php
index 90240882..d56165ab 100644
--- a/application/language/portuguese/default_lang.php
+++ b/application/language/portuguese/default_lang.php
@@ -13,6 +13,7 @@
     $lang['label_delete_votes'] = 'Apagar votos';
     $lang['label_description'] = 'Descrição';
     $lang['label_idea'] = 'Idéia';
+    $lang['label_idea_approve'] = 'Aprovar Idéia';
     $lang['label_idea_title'] = 'Título da Idéia';
     $lang['label_ideas'] = 'Idéias';
     $lang['label_log'] = 'Log';
diff --git a/application/language/portuguese/log_lang.php b/application/language/portuguese/log_lang.php
index ca5affab..a0bf4073 100644
--- a/application/language/portuguese/log_lang.php
+++ b/application/language/portuguese/log_lang.php
@@ -16,3 +16,5 @@
     $lang['log_category_description'] = 'descrição foi atualizada';
     $lang['log_category_changed'] = 'Categoria \'%s1\' alterada para \'%s2\'';
     $lang['log_category_deleted'] = 'Categoria %s removida';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/language/spanish/default_lang.php b/application/language/spanish/default_lang.php
index 8d8c8dbd..3649042a 100644
--- a/application/language/spanish/default_lang.php
+++ b/application/language/spanish/default_lang.php
@@ -13,6 +13,7 @@
     $lang['label_delete_votes'] = 'Borrar votos';
     $lang['label_description'] = 'Descripción';
     $lang['label_idea'] = 'Idea';
+    $lang['label_idea_approve'] = 'Aprobar idea';
     $lang['label_idea_title'] = 'Título de idea';
     $lang['label_ideas'] = 'Ideas';
     $lang['label_log'] = 'Log';
diff --git a/application/language/spanish/log_lang.php b/application/language/spanish/log_lang.php
index 9ccab583..c7a28416 100644
--- a/application/language/spanish/log_lang.php
+++ b/application/language/spanish/log_lang.php
@@ -16,3 +16,5 @@
     $lang['log_category_description'] = 'descripción ha sido modificada';
     $lang['log_category_changed'] = 'Categoría \'%s1\' cambiada a\'%s2\'';
     $lang['log_category_deleted'] = 'Categoría %s borrada';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/language/thai/default_lang.php b/application/language/thai/default_lang.php
new file mode 100644
index 00000000..730f8fda
--- /dev/null
+++ b/application/language/thai/default_lang.php
@@ -0,0 +1,78 @@
+<?php
+    $lang['label_activity'] = 'กิจกรรม';
+    $lang['label_ban_user'] = 'แบนผู้ใช้';
+    $lang['label_categories'] = 'หมวดหมู่';
+    $lang['label_category'] = 'หมวดหมู่';
+    $lang['label_change_password'] = 'เปลี่ยนรหัสผ่าน';
+    $lang['label_change_status'] = 'เปลี่ยนสถานะ';
+    $lang['label_commented'] = 'ข้อเสนอแนะใน';
+    $lang['label_comments'] = 'ข้อเสนอแนะ';
+    $lang['label_date'] = 'วันที่';
+    $lang['label_delete_comment'] = 'ลบข้อเสนอแนะ';
+    $lang['label_delete_idea'] = 'ลบไอเดีย';
+    $lang['label_delete_votes'] = 'ลบโหวต';
+    $lang['label_description'] = 'รายละเอียด';
+    $lang['label_idea'] = 'ไอเดีย';
+    $lang['label_idea_approve'] = 'อนุมัติไอเดีย';
+    $lang['label_idea_title'] = 'ชื่อไอเดีย';
+    $lang['label_ideas'] = 'ไอเดีย';
+    $lang['label_log'] = 'Log';
+    $lang['label_log_in'] = 'เข้าสู่ระบบ';
+    $lang['label_log_out'] = 'ออกจากระบบ';
+    $lang['label_logged_as'] = 'เข้าสู่ระบบโดย';
+    $lang['label_post_new_idea'] = 'โพสต์ไอเดียใหม่';
+    $lang['label_profiles'] = 'โปรไฟล์';
+    $lang['label_registration'] = 'ลงทะเบียน';
+    $lang['label_registration_form'] = 'แบบฟอร์มลงทะเบียน';
+    $lang['label_reset_votes'] = 'รีเซ็ตการโหวต';
+    $lang['label_search'] = 'ค้นหา';
+    $lang['label_sign_in'] = 'เข้าสู่ระบบ';
+    $lang['label_submit'] = 'ส่ง';
+    $lang['label_vote'] = 'โหวต';
+    $lang['label_votes'] = 'โหวต';
+
+    $lang['text_shared_this_idea'] = 'แบ่งปันไอเดีย';
+    $lang['text_flag_comment'] = 'ติดธงข้อเสนอแนะ';
+    $lang['text_create_an_account'] = 'หรือสร้างบัญช';
+    $lang['text_registration_success'] = 'การลงทะเบียนสำเร็จแล้ว';
+    $lang['text_select_category'] = 'เลือกหมวดหมู่...';
+    $lang['text_nothing_found'] = 'ไม่พบอะไร...';
+    $lang['text_votes_left'] = 'เหลือโหวต.';
+    $lang['text_sure_delete_idea'] = 'คุณแน่ใจหรือไม่ที่จะลบไอเดียนี้?';
+    $lang['text_sure_delete_comment'] = 'คุณแน่ใจหรือไม่ที่จะลบข้อเสนอแนะนี้?';
+
+    $lang['idea_completed'] = 'เรยีบร้อยแล้ว';
+    $lang['idea_started'] = 'เริ่มต้น';
+    $lang['idea_planned'] = 'วางแผน';
+    $lang['idea_considered'] = 'การพิจารณา';
+    $lang['idea_declined'] = 'ปฏิเสธ';
+    $lang['idea_new'] = 'อยู่ระหว่างการพิจารณา';
+
+    $lang['last_completed_ideas'] = 'ไอเดียล่าสุดที่เสร็จสมบูรณ์';
+    $lang['last_started_ideas'] = 'ไอเดียที่เริ่มต้นล่าสุด';
+    $lang['last_planned_ideas'] = 'ไอเดียที่วางแผนไว้ล่าสุด';
+    $lang['last_considered_ideas'] = 'ไอเดียที่พิจารณาครั้งล่าสุด';
+
+    $lang['form_remember'] = 'จดจำฉัน';
+    $lang['form_full_name'] = 'ชื่อเต็ม';
+    $lang['form_email'] = 'ที่อยู่อีเมล';
+    $lang['form_password'] = 'รหัสผ่าน';
+    $lang['form_repeat_password'] = 'รหัสผ่านซ้ำอีกครั้ง';
+    $lang['form_password_old'] = 'รหัสผ่านเดิม';
+    $lang['form_password_new'] = 'รหัสผ่านใหม่';
+    $lang['from_password_new_repeat'] = 'หัสผ่านใหม่อีกครั้ง';
+
+    $lang['error_login_to_post'] = 'คุณต้องเข้าสู่ระบบเพื่อโพสต์ไอเดียใหม่';
+    $lang['error_login'] = 'รหัสผ่านหรืออีเมลไม่ถูกต้อง';
+    $lang['error_recaptcha'] = 'รหัส Recaptcha ไม่ถูกต้อง';
+    $lang['error_name'] = 'ชื่อไม่ถูกต้อง';
+    $lang['error_email'] = 'อีเมล์ไม่ถูกต้อง';
+    $lang['error_password'] = 'รหัสผ่านต้องมีอักขระอย่างน้อย 6 ตัว';
+    $lang['error_password_old'] = 'รหัสผ่านเดิมไม่ถูกต้อง';
+    $lang['error_passwords'] = 'รหัสผ่านไม่ตรงกัน';
+    $lang['error_email_exists'] = 'มีอีเมลนี้อยู่แล้ว';
+    $lang['error_banned'] = 'คุณถูกแบนเป็นเวลา %s วัน';
+    $lang['error_banned_inf'] = 'คุณถูกแบนอย่างไม่มีกำหนด';
+    $lang['error_title'] = 'ชื่อสั้นเกินไป';
+    $lang['error_category'] = 'กรุณาเลือกหมวดหมู่';
+    $lang['error_description'] = 'รายละเอียดสั้นเกินไป';
diff --git a/application/language/thai/index.html b/application/language/thai/index.html
new file mode 100755
index 00000000..c942a79c
--- /dev/null
+++ b/application/language/thai/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/application/language/thai/log_lang.php b/application/language/thai/log_lang.php
new file mode 100644
index 00000000..8ec2dd1e
--- /dev/null
+++ b/application/language/thai/log_lang.php
@@ -0,0 +1,20 @@
+<?php
+    $lang['log_commented'] = 'ไอเดีย %s ได้รับข้อเสนอแนะ';
+    $lang['log_comment_deleted'] = 'ลบข้อเสนอแนะ %s แล้ว';
+    $lang['log_idea_approved'] = 'ไอเดียที่ได้รับอนุมัติแล้ว %s';
+    $lang['log_idea_deleted'] = 'ลบไอเดีย %s แล้ว';
+    $lang['log_idea_status'] = 'เปลี่ยนสถานะไอเดียจาก %s1 เป็น %s2';
+    $lang['log_user_registered'] = 'ผู้ใช้งานลงทะเบียนแล้ว';
+    $lang['log_new_idea'] = 'สร้างไอเดียใหม่แล้ว';
+    $lang['log_idea_voted'] = 'ไอเดีย %s1 ได้รับการโหวต %s2 โหวต';
+    $lang['log_user_banned'] = 'แบนผู้ใช้ %s1 เป็นเวลา %s2 วัน';
+    $lang['log_user_was_banned'] = 'ผู้ใช้ %s ถูกแบนแล้ว';
+    $lang['log_user_unbanned'] = 'ยกเลิกการแบนสำหรับผู้ใช้ %s';
+    $lang['log_settings'] = 'การตั้งค่าได้รับการแก้ไขแล้ว';
+    $lang['log_user_admin'] = 'ผู้ใช้ถูกอัพเดทโดยผู้ดูแลระบบ';
+    $lang['log_category_created'] = 'หมวดหมู่ถูกสร้างแล้ว';
+    $lang['log_category_description'] = 'อัพเดทรายละเอียดแล้ว';
+    $lang['log_category_changed'] = 'หมวดหมู่ \'%s1\' ถูกเปลี่ยนเป็น \'%s2\'';
+    $lang['log_category_deleted'] = 'หมวดหมู่ %s ถูกลบแล้ว';
+    $lang['log_new_idea_mail_content'] = 'A new idea has been posted in your feedback system %s. To find it, click the following link : %s.';
+    $lang['log_new_comment_mail_content'] = 'A new comment has been posted in your feedback system %s. To find it, click the following link : %s.';
diff --git a/application/libraries/Display.php b/application/libraries/Display.php
index 4fe7f4c2..93b4b72d 100644
--- a/application/libraries/Display.php
+++ b/application/libraries/Display.php
@@ -2,10 +2,31 @@
 
 class Display {
 
+    /**
+     * @param $string
+     * @return mixed|string
+     * @deprecated use slugify static instead keep for retrocompatibility
+     */
     public function getParsedString($string) {
-        $parsedString = str_replace([' ', ','], '-', $string);
-        $parsedString = preg_replace('/[^a-zA-Z0-9-]/', '', $parsedString);
+        return $this->slugify($string);
+    }
+
+    public static function slugify($text)
+    {
+        // replace non letter or digits by -
+        $text = preg_replace('~[^\\pL\d]+~u', '-', $text);
+        // trim
+        $text = trim($text, '-');
+        // transliterate
+        $text = iconv('utf-8', 'us-ascii//TRANSLIT', $text);
+        // lowercase
+        $text = strtolower($text);
+        // remove unwanted characters
+        $text = preg_replace('~[^-\w]+~', '', $text);
 
-        return $parsedString;
+        if (empty($text)) {
+            return 'n-a';
+        }
+        return $text;
     }
 }
\ No newline at end of file
diff --git a/application/models/get.php b/application/models/get.php
index ba165155..64d5fcb9 100755
--- a/application/models/get.php
+++ b/application/models/get.php
@@ -18,7 +18,7 @@ public function __construct(){
 	}
 
 	public function getCategories() {
-    	$result = $this->db->get('categories')->result();
+    	$result = $this->db->query('SELECT * FROM categories ORDER BY name')->result();
         $categoryList = array();
         foreach ($result as $category) {
             $categoryList[$category->id] = $category;
@@ -28,7 +28,18 @@ public function getCategories() {
     	return $categoryList;
     }
 
-    
+    /**
+     * @return \stdClass
+     */
+    public function getLastIdea()
+    {
+    	$query = "SELECT * FROM ideas ORDER BY id DESC LIMIT 1";
+    	$res = $this->db->query($query)->result();
+
+        return $this->decorateIdea(current($res));
+    }
+
+
     public function getIdea($idea_id){
     	$idea_id = (int) $idea_id;
 
@@ -44,7 +55,7 @@ public function getCommentsByIdea($idea_id){
     	return $this->db->query($query)->result();
     }
 
-    
+
     public function getQuantityOfApprovedIdeas($categoryid){
         $categoryid = (int) $categoryid;
         $query = $this->db->query("SELECT * FROM ideas WHERE categoryid='$categoryid' AND status !='new'");
@@ -57,7 +68,8 @@ public function getIdeas($orderby, $isdesc, $from, $limit, $status = array(), $c
         if (count($categories)) {
             $query .= "WHERE ( ";
             foreach ($categories as $catid) {
-                $query .= "categoryid='$catid' OR ";
+                $sanitizedCategoryId = (int) $catid;
+                $query .= "categoryid='$sanitizedCategoryId' OR ";
             }
             $query = substr($query, 0, -3);
             $query .= ") ";
@@ -66,11 +78,14 @@ public function getIdeas($orderby, $isdesc, $from, $limit, $status = array(), $c
             if (count($categories)) $query .= "AND (";
             else $query .= "WHERE ( ";
             foreach ($status as $s) {
-                $query .= "status='$s' OR ";
+                $s = $this->db->escape($s);
+
+                $query .= "status=$s OR ";
             }
             $query = substr($query, 0, -3);
             $query .= ") ";
         }
+        $orderby = $this->db->escape($orderby);
         $query .= "ORDER BY $orderby ";
 
         if ($isdesc) $query .= "DESC";
@@ -89,7 +104,7 @@ public function categoryExists($id) {
         if($result->num_rows() == 0) return false;
         return true;
     }
-    
+
     public function getIdeasByCategory($category, $order, $type, $page){
         $page = (int) $page;
     	$category = (int) $category;
@@ -119,21 +134,23 @@ public function getIdeasByCategory($category, $order, $type, $page){
         return $this->decorateIdeas($ideas);
     }
 
-    
+
     public function getIdeasBySearchQuery($query){
         $keywords = explode(" ", $query);
-        $temp = array_shift($keywords);
+        $temp = $this->db->escape_like_str(array_shift($keywords));
         $query = "SELECT * FROM ideas WHERE ( title LIKE '%$temp%'";
 
-        foreach($keywords as $key){
-            $query .= " OR title LIKE '%$key%'";
+        foreach($keywords as $key) {
+            $escapedKey = $this->db->escape_like_str($key);
+            $query .= " OR title LIKE '%$escapedKey%'";
         }
         $query .= ") ORDER BY CASE ";
         $query .= " WHEN title LIKE '$temp%' THEN 0 ";
         $query .= " WHEN title LIKE '%$temp%' THEN 2 ";
-        foreach($keywords as $id => $key){
-            $query .= " WHEN title LIKE '$key%' THEN ". ($id+1) ." ";
-            $query .= " WHEN title LIKE '%$key%' THEN ". ($id + 3) . " ";
+        foreach($keywords as $id => $key) {
+            $escapedKey = $this->db->escape_like_str($key);
+            $query .= " WHEN title LIKE '$escapedKey%' THEN ". ($id+1) ." ";
+            $query .= " WHEN title LIKE '%$escapedKey%' THEN ". ($id + 3) . " ";
         }
         $query .= "END";
 
@@ -142,7 +159,7 @@ public function getIdeasBySearchQuery($query){
         return $this->decorateIdeas($ideas);
     }
 
-    
+
     public function getUser($user_id){
         $user_id = (int) $user_id;
         return $this->get_row_by_id('users', $user_id);
@@ -179,6 +196,9 @@ public function get_all_settings(){
 
     public function get_row_by_id($table, $id){
         $id = (int) $id;
+
+        if (!$this->isValidTable($table)) return false;
+
         $sql = $this->db->query("SELECT * FROM $table WHERE id='$id'");
         if($sql->num_rows() == 0) return false;
         return $sql->row();
@@ -281,7 +301,7 @@ public function get_flags() {
 
     public function get_logs($to, $toid, $limit = 0) {
         $toid = (int) $toid;
-        $limit = (int) $limit;     
+        $limit = (int) $limit;
         if($limit != 0) $sql = $this->db->query("SELECT * FROM logs WHERE type=". $this->db->escape($to) ." AND toid='$toid' ORDER BY id DESC LIMIT $limit");
         else $sql = $this->db->query("SELECT * FROM logs WHERE type=". $this->db->escape($to) ." AND toid='$toid' ORDER BY id DESC");
         return $sql->result();
@@ -328,7 +348,8 @@ public function get_admin_users() {
     }
 
     public function category_id($name) {
-        $sql = $this->db->query("SELECT id FROM categories where name='$name'");
+        $name = $this->db->escape($name);
+        $sql = $this->db->query("SELECT id FROM categories where name=$name");
         if($sql->num_rows() == 0) return 0;
         else{
             $cat = $sql->row();
@@ -358,6 +379,10 @@ public function setSessionUserValues($user) {
         $_SESSION['phpback_isadmin'] = $user->isadmin;
     }
 
+    public function getAutoUpdaterEnabled() {
+        return $this->config->item('auto_update');
+    }
+
     public function setSessionCookie() {
         setcookie('phpback_sessionid',  $this->new_token($_SESSION['phpback_userid']), time()+3600*24*30, '/');
     }
@@ -383,4 +408,8 @@ private function decorateCategories(&$categories) {
             $category->url .= $this->display->getParsedString($category->name);
         }
     }
-}
\ No newline at end of file
+
+    private function isValidTable($table) {
+        return ctype_alnum($table) || $table === '_session';
+    }
+}
diff --git a/application/models/post.php b/application/models/post.php
index f5cfa885..d9db91eb 100755
--- a/application/models/post.php
+++ b/application/models/post.php
@@ -28,29 +28,29 @@ public function add_user($name, $email, $pass, $votes, $isadmin){
         $isadmin = (int) $isadmin;
         if($votes < 1) return false;
 
-        $sql = $this->db->query("SELECT id FROM users WHERE email='" . $email . "'");
+        $sql = $this->db->query("SELECT id FROM users WHERE email=" . $this->db->escape($email));
 
         if($sql->num_rows()) return false;
 
         if($isadmin){
         	$data = array(
-	   			'id' => '',
 	   			'name' => $name,
                 'email' => $email,
 	   			'pass' => $pass,
 	   			'votes' => $votes,
-	   			'isadmin' => $isadmin
+	   			'isadmin' => $isadmin,
+                'banned' => '0'
 			);
         }
         else{
         	$data = array(
-	   			'id' => '',
 	   			'name' => $name,
                 'email' => $email,
 	   			'pass' => $pass,
 	   			'votes' => $votes,
-	   			'isadmin' => '0'
-			); 
+	   			'isadmin' => '0',
+                'banned' => '0'
+			);
         }
 
 		$this->db->insert('users', $data);
@@ -63,7 +63,6 @@ public function add_idea($title, $content, $author_id, $category_id){
         $category_id = (int) $category_id;
         if($author_id < 1 || $category_id < 1) return false;
         $data = array(
-	   			'id' => '',
 	   			'title' => $title,
 	   			'content' => $content,
 	   			'authorid' => $author_id,
@@ -72,21 +71,20 @@ public function add_idea($title, $content, $author_id, $category_id){
 	   			'comments' => '0',
 	   			'status' => 'new',
 	   			'categoryid' => $category_id,
-			); 
+			);
         $this->db->insert('ideas', $data);
       	$this->log($this->lang->language['log_new_idea'] . ": $title", "user", $author_id);
         return true;
     }
 
     public function add_comment($idea_id, $comment, $user_id){
-        
+
 
         $idea_id = (int) $idea_id;
         $user_id = (int) $user_id;
         if($idea_id < 1 || $user_id < 1) return false;
 
         $data = array(
-	   			'id' => '',
 	   			'content' => $comment,
 	   			'ideaid' => $idea_id,
 	   			'userid' => $user_id,
@@ -103,8 +101,6 @@ public function add_comment($idea_id, $comment, $user_id){
 
 
     public function vote($idea_id, $user_id, $votes){
-        
-
         $idea_id = (int) $idea_id;
         $user_id = (int) $user_id;
         $votes = (int) $votes;
@@ -121,7 +117,6 @@ public function vote($idea_id, $user_id, $votes){
         if(!$sql->num_rows()){
             if($votes <= $USER->votes){
                 $data = array(
-		   			'id' => '',
 		   			'ideaid' => $idea_id,
 		   			'userid' => $user_id,
 		   			'number' => $votes,
@@ -160,12 +155,20 @@ public function updateadmin($id, $level){
 
     public function update_by_id($table, $field, $value, $id){
         $id = (int) $id;
-        $query = "UPDATE $table SET $field='$value' WHERE id='$id'";
+        $value = $this->db->escape($value);
+
+        if(!$this->isAlphaNumeric($table)) return false;
+        if(!$this->isAlphaNumeric($field)) return false;
+
+        $query = "UPDATE $table SET $field=$value WHERE id='$id'";
         $this->db->query($query);
     }
 
     public function delete_row_by_id($table, $id){
         $id = (int) $id;
+        if(!$this->isAlphaNumeric($table)) return false;
+
+
         $this->db->query("DELETE FROM $table WHERE id='$id'");
     }
 
@@ -227,9 +230,13 @@ public function deleteidea($id){
         }
 
         $cat = $this->get_row_by_id('categories', $idea->categoryid);
-        $this->update_by_id('categories', 'ideas', $cat->ideas - 1, $cat->id);
+
+        if ($idea->status !== 'new' && $idea->status !== 'declined') {
+            $this->update_by_id('categories', 'ideas', $cat->ideas - 1, $cat->id);
+        }
 
         $this->db->query("DELETE FROM ideas WHERE id='$id'");
+        $this->db->query("DELETE FROM votes WHERE ideaid='$id'");
     }
 
 
@@ -247,7 +254,7 @@ public function change_status($ideaid, $status){
             }
             $this->db->query("DELETE FROM votes WHERE ideaid='$ideaid'");
 
-            if ($status == 'declined') {
+            if ($status == 'declined' && $idea->status !== 'new') {
                 $category = $this->get_row_by_id('categories', $idea->categoryid);
                 $this->update_by_id('categories', 'ideas', $category->ideas - 1, $category->id);
             }
@@ -256,6 +263,7 @@ public function change_status($ideaid, $status){
     }
 
     public function approveidea($id){
+        $id = (int) $id;
         $idea = $this->db->query("SELECT * FROM ideas WHERE id='$id'")->row();
         $category = $this->get_row_by_id('categories', $idea->categoryid);
 
@@ -266,7 +274,6 @@ public function approveidea($id){
     public function log($string, $to, $toid){
         $toid = (int) $toid;
         $data = array(
-        	'id' => '',
         	'content' => $string,
         	'date' => date("d/m/y H:i"),
         	'type' => $to,
@@ -277,7 +284,6 @@ public function log($string, $to, $toid){
 
     public function add_category($name, $description){
         $data = array(
-            'id' => '',
             'name' => $name,
             'description' => $description,
             'ideas' => 0,
@@ -292,6 +298,7 @@ public function delete_category($id){
 
     private function get_row_by_id($table, $id){
         $id = (int) $id;
+        if(!$this->isAlphaNumeric($table)) return false;
         $sql = $this->db->query("SELECT * FROM $table WHERE id='$id'");
         return $sql->row();
     }
@@ -302,6 +309,9 @@ private function getSetting($name){
         if(@isset($data->value)) return $data->value;
         else return false;
     }
+
+    private function isAlphaNumeric($text) {
+        return ctype_alnum($text);
+    }
 }
 
-?>
\ No newline at end of file
diff --git a/application/views/_templates/header.php b/application/views/_templates/header.php
index 1e2f104c..6bbde883 100644
--- a/application/views/_templates/header.php
+++ b/application/views/_templates/header.php
@@ -59,7 +59,7 @@ function popup_sure(text, url) {
     <div class="pull-right" style="padding-top:15px;padding-right:40px;">
       <small><span class="logged-as-label"><?= $lang['label_logged_as']; ?></span>
           <span style='color:#999;margin-left:5px;'>
-            <a href="<?php echo base_url() . 'home/profile/' . $_SESSION['phpback_userid'] . '/' . str_replace(" ", "-", $_SESSION['phpback_username']); ?>"><?php echo $_SESSION['phpback_username']; ?></a>
+            <a href="<?php echo base_url() . 'home/profile/' . $_SESSION['phpback_userid'].'/'.Display::slugify($_SESSION['phpback_username']); ?>"><?php echo $_SESSION['phpback_username']; ?></a>
           </span>
       <a href="<?php echo base_url() . 'action/logout'; ?>"><button type="button" class="btn btn-danger btn-xs" style="margin-left:10px;"><?php echo $lang['label_log_out']; ?></button></a></small>
     </div>
diff --git a/application/views/admin/dashboard/ideas.php b/application/views/admin/dashboard/ideas.php
index cdebb135..ff8c4a7c 100755
--- a/application/views/admin/dashboard/ideas.php
+++ b/application/views/admin/dashboard/ideas.php
@@ -7,7 +7,7 @@
         </div>
       </div>
       <div class="collapse navbar-collapse" id="navbar-collapse-01">
-        <ul class="nav navbar-nav">           
+        <ul class="nav navbar-nav">
           <li><a href="<?php echo base_url() . 'admin'; ?>">Dashboard</a></li>
           <li class="active"><a href="<?php echo base_url() . 'admin/ideas'; ?>">Ideas and Comments</a></li>
           <?php if($_SESSION['phpback_isadmin'] > 1){?>
@@ -17,7 +17,7 @@
           <?php } } ?>
         </ul>
           <p class="navbar-text navbar-right">Signed in as <span style="color:#27AE60"><?php echo $_SESSION['phpback_username']; ?></span><a href="<?php echo base_url() . 'action/logout'; ?>"><button type="button" class="btn btn-danger btn-xs" style="margin-left:10px;">Log out</button></a></p>
-           
+
       </div><!-- /.navbar-collapse -->
     </nav><!-- /navbar -->
     <div>
@@ -40,7 +40,7 @@
             </thead>
               <tbody>
                 <?php foreach ($newideas as $idea): ?>
-                <?php $freename = str_replace(" ", "-", $idea->title); ?>
+                <?php $freename = Display::slugify($idea->title); ?>
             <tr class="<?php
             switch ($idea->status) {
               case 'considered':
@@ -80,7 +80,7 @@
           </tbody>
         </table>
         <div id="allideastable" class="row" style="display:none" >
-    <div class="col-md-5">
+    <div class="col-md-4">
             <form role="form" method="post" action="<?php echo base_url() . 'admin/ideas';?>">
             <input type="hidden" name="search" value="1">
             <table>
@@ -120,7 +120,7 @@
                 </label>
               </div>
               </td>
-              <td style="padding-left:10px;width:250px;">
+              <td style="padding-left:10px;width:250px;vertical-align:top">
               <div class="form-group">
                 <?php foreach ($categories as $category): ?>
                   <label class="checkbox">
@@ -142,7 +142,7 @@
                <td style="padding-left:10px;">
                  <label class="checkbox"t>
                     <input type="checkbox" <?php if($form['isdesc']) echo 'checked=""';?> name="isdesc" data-toggle="checkbox">
-                    Descresing order
+                    Decreasing order
                   </label>
                </td>
               </tr>
@@ -167,7 +167,7 @@
          </thead>
           <tbody>
             <?php foreach ($ideas as $idea): ?>
-            <?php $freename = str_replace(" ", "-", $idea->title); ?>
+            <?php $freename = Display::slugify($idea->title); ?>
         <tr class="<?php
         switch ($idea->status) {
           case 'considered':
@@ -218,7 +218,7 @@
                   <tr>
                   <td>
                     Comment: #<?php echo $comment['id'];?>
-                    <br>User: 
+                    <br>User:
                     <a href="<?php echo base_url() . 'admin/users/' . $comment['userid'];?>">#<?php echo $comment['userid'];?></a>
                     <br>Idea:
                     <a href="<?php echo base_url() . 'home/idea/' . $comment['ideaid'];?>" target="_blank">#<?php echo $comment['userid'];?></a>
@@ -229,9 +229,9 @@
                     </samp>
                   </td>
                   <td>
-                    <span style="font-size:17px;">Flagged <span class="badge"><?php echo $comment['votes']; ?></span><span style="font-size:17px;"> times</span> 
+                    <span style="font-size:17px;">Flagged <span class="badge"><?php echo $comment['votes']; ?></span><span style="font-size:17px;"> times</span>
                     <div class="pull-right">
-                      <button type="submit" class="btn btn-warning btn-sm" style="width:130px" <?php $temp = base_url() . 'adminaction/deletecomment/' . $comment['id']; ?> onclick="popup_sure('Are you sure you want to delete this comment?','<?php echo $temp; ?>');">Delete Comment</button>
+                      <button name="Delete votes" type="submit" class="btn btn-warning btn-sm" style="width:130px" <?php $temp = base_url() . 'adminaction/deletecomment/' . $comment['id']; ?> onclick="popup_sure('Are you sure you want to delete this comment?','<?php echo $temp; ?>');">Delete Comment</button>
                       <?php if($_SESSION['phpback_isadmin'] > 1): ?><a href="<?php echo base_url() . 'admin/users/' . $comment['userid']; ?>"><button type="submit" class="btn btn-danger btn-sm" style="width:130px">Ban User</button></a><?php endif;?>
                     </div>
                   </td>
diff --git a/application/views/admin/dashboard/users.php b/application/views/admin/dashboard/users.php
index e67628fb..09e4817e 100755
--- a/application/views/admin/dashboard/users.php
+++ b/application/views/admin/dashboard/users.php
@@ -38,10 +38,10 @@
             </thead>
               <tbody>
             <?php foreach ($users as $user): ?>
-              <?php $freename = str_replace(" ", "-", $user->name); ?>
+              <?php $freename = Display::slugify($user->name); ?>
             <tr>
               <td>
-                <a href="<?php echo base_url() . 'home/profile/' . $user->id . '/' . $freename; ?>" target="_blank">#<?php echo $user->id;?></a>
+                <a href="<?php echo base_url() . 'home/profile/' . $user->id. '/' . $freename; ?>" target="_blank">#<?php echo $user->id;?></a>
               </td>
               <td>
                 <?php echo $user->name; ?>
diff --git a/application/views/home/index.php b/application/views/home/index.php
index a914fab5..6055ad06 100755
--- a/application/views/home/index.php
+++ b/application/views/home/index.php
@@ -6,8 +6,8 @@
 		</ol>
 		</small>
 		<div>
-			<h4 id="welcome-mesagge--title">Welcome to our FeedBack</h4>
-			<div id="welcome-mesagge--text">Here you can suggest ideas to improve our services or vote on ideas from other people.</div>
+			<h4 id="welcome-mesagge--title"><?= $welcomeTitle; ?></h4>
+			<div id="welcome-mesagge--text"><?= $welcomeDescription; ?></div>
 		</div>
 		
 		<br/>
diff --git a/application/views/home/login.php b/application/views/home/login.php
index ee067aa9..552c819a 100755
--- a/application/views/home/login.php
+++ b/application/views/home/login.php
@@ -13,11 +13,11 @@
   <form name="login-form" action="<?php echo base_url() . 'action/login'; ?>" method="POST">
     <div class="form-group">
       <label for="InputEmail"><?php echo $lang['form_email']; ?></label>
-      <input type="email" class="form-control" id="InputEmail" placeholder="<?php echo $lang['form_email']; ?>" name="email">
+      <input type="email" class="form-control" id="InputEmail" placeholder="<?php echo $lang['form_email']; ?>" name="email" required>
     </div>
     <div class="form-group">
       <label for="InputPassword"><?php echo $lang['form_password']; ?></label>
-      <input type="password" class="form-control" id="InputPassword" placeholder="<?php echo $lang['form_password']; ?>" name="password">
+      <input type="password" class="form-control" id="InputPassword" placeholder="<?php echo $lang['form_password']; ?>" name="password" required>
     </div>
     <label class="checkbox" for="checkbox1">
       <input type="checkbox" value="" id="checkbox1" name="rememberme" data-toggle="checkbox">
diff --git a/application/views/home/post_idea.php b/application/views/home/post_idea.php
index ee7ab40b..5877c820 100755
--- a/application/views/home/post_idea.php
+++ b/application/views/home/post_idea.php
@@ -23,12 +23,12 @@
 	<form name="post-idea-form" method="post" action="<?php echo base_url() . 'action/newidea'?>">
 	  <div class="form-group">
 	    <label for="exampleInputEmail1"><?php echo $lang['label_idea_title']; ?></label>
-	    <input type="text" class="form-control" name="title" value="<?php if(@isset($POST['title'])) echo $POST['title'];?>">
+	    <input type="text" class="form-control" name="title" value="<?php if(@isset($POST['title'])) echo $POST['title'];?>" minlength="9" maxlength="100" required>
 	  </div>
 	  <div class="form-group">
 	  <label><?php echo $lang['label_category']; ?></label>
-	    <select class="form-control" name="category">
-		  <option value="0"><?php echo $lang['text_select_category']; ?></option>
+	    <select class="form-control" name="category" required>
+		  <option value=""><?php echo $lang['text_select_category']; ?></option>
 		  <?php foreach ($categories as $cat):?>
 		  <option value="<?php echo $cat->id;?>" <?php if(@isset($POST['catid']) && $POST['catid'] == $cat->id) echo 'selected="selected"';?>><?php echo $cat->name;?></option>
 		  <?php endforeach; ?>
@@ -36,7 +36,7 @@
 	  </div>
 	  <div class="form-group">
 	  <label><?php echo $lang['label_description'];?></label>
-	    <textarea class="form-control" rows="4" name="description"><?php if(@isset($POST['desc'])) echo $POST['desc'];?></textarea>
+	    <textarea class="form-control" rows="4" name="description" minlength="20" maxlength="1500" required><?php if(@isset($POST['desc'])) echo $POST['desc'];?></textarea>
 	  </div>
 	  <button type="submit" class="btn btn-primary"><?php echo $lang['label_submit'];?></button>
 	</form>
diff --git a/application/views/home/register.php b/application/views/home/register.php
index 2acdb8c2..ef0bd4cb 100755
--- a/application/views/home/register.php
+++ b/application/views/home/register.php
@@ -15,27 +15,31 @@
     <p class="bg-danger" style="width:100%;height:30px;padding-left:10px;padding-top:5px;"><?php echo $lang['error_password']; ?></p>
   <?php } elseif ($error == "pass2") {?>
     <p class="bg-danger" style="width:100%;height:30px;padding-left:10px;padding-top:5px;"><?php echo $lang['error_passwords']; ?></p>
-  <?php } elseif ($error == "exits") {?>
+  <?php } elseif ($error == "exists") {?>
     <p class="bg-danger" style="width:100%;height:30px;padding-left:10px;padding-top:5px;"><?php echo $lang['error_email_exists']; ?></p>
   <?php } ?>
 
-  <form name="registration-form" action="<?php echo base_url() . 'action/register'; ?>" method="POST">
+  <form name="registration-form" action="<?php echo base_url() . 'action/register'; ?>" method="POST" onsubmit="return validateForm()">
    	<div class="form-group">
       <label for="InputEmail"><?php echo $lang['form_email']; ?></label>
-      <input type="email" class="form-control" id="InputEmail" placeholder="<?php echo $lang['form_email']; ?>" name="email">
+      <input type="email" class="form-control" id="InputEmail" placeholder="<?php echo $lang['form_email']; ?>" name="email" required>
     </div>
 
     <div class="form-group">
       <label for="InputName"><?php echo $lang['form_full_name']; ?></label>
-      <input type="text" class="form-control" id="InputName" placeholder="<?php echo $lang['form_full_name']; ?>" name="name">
+      <input type="text" class="form-control" id="InputName" placeholder="<?php echo $lang['form_full_name']; ?>" name="name" required>
     </div>
+	
+	
+	
     <div class="form-group">
       <label for="InputPassword"><?php echo $lang['form_password']; ?></label>
-      <input type="password" class="form-control" id="InputPassword" placeholder="<?php echo $lang['form_password']; ?>" name="password">
-    </div>
+	  <div id="password-error-show" style="color:red"></div>
+      <input type="password" class="form-control" id="InputPassword" placeholder="<?php echo $lang['form_password']; ?>" name="password" minlength="6" required>
+	</div>
     <div class="form-group">
       <label for="InputPassword2"><?php echo $lang['form_repeat_password']; ?></label>
-      <input type="password" class="form-control" id="InputPassword2" placeholder="<?php echo $lang['form_repeat_password']; ?>" name="password2">
+      <input type="password" class="form-control" id="InputPassword2" placeholder="<?php echo $lang['form_repeat_password']; ?>" name="password2" required>
     </div>
   <?php if ($recaptchapublic != ""): ?>
     <script type="text/javascript">
@@ -44,10 +48,11 @@
 	 };
  	</script>
     <script type="text/javascript"
-     src="https://www.google.com/recaptcha/api/challenge?k=<?php echo $recaptchapublic; ?>">
+     src="https://www.google.com/recaptcha/api.js" async defer>
   </script>
+  <div class="g-recaptcha" data-sitekey="<?php echo $recaptchapublic; ?>"></div>
   <noscript>
-     <iframe src="https://www.google.com/recaptcha/api/noscript?k=<?php echo $recaptchapublic; ?>"
+     <iframe src="https://www.google.com/recaptcha/api/fallback?k=<?php echo $recaptchapublic; ?>"
          height="300" width="500" frameborder="0"></iframe><br>
      <textarea name="recaptcha_challenge_field" rows="3" cols="40">
      </textarea>
@@ -58,3 +63,20 @@
     <div style="margin-top:10px"><button type="submit" class="btn btn-primary"><?php echo $lang['label_registration']; ?></button></div>
   </form>
 </div>
+
+<script>
+function validateForm() {
+    var pass = document.forms["registration-form"]["password"].value;
+	var passVerify = document.forms["registration-form"]["password2"].value;
+	
+	var errorShowDiv = document.getElementById("password-error-show");
+	
+	var passMatchError = "<?php echo $lang['error_passwords']?>";
+	
+    if (pass != passVerify) {
+		errorShowDiv.innerHTML = passMatchError;
+        return false;
+    }
+	
+}
+</script>
diff --git a/application/views/home/user.php b/application/views/home/user.php
index 68286007..8c3b1d6d 100755
--- a/application/views/home/user.php
+++ b/application/views/home/user.php
@@ -43,18 +43,20 @@
 			</tbody>
 		</table>
 		<div id="changepasswordtable" style="display:none">
-			<form role="form" method="post" action="<?= base_url() . 'action/changepassword'?>">
+			<form role="form" name="password-change-form" method="post" action="<?= base_url() . 'action/changepassword'?>" onsubmit="return validateForm()">
 	            <div class="form-group">
 	              <label><?= $lang['form_password_old']; ?></label>
-	              <input type="password" class="form-control" name="old" style="width:150px">
+	              <input type="password" class="form-control" name="old" style="width:150px" required>
 	            </div>
 	            <div class="form-group">
+				  
 	              <label><?= $lang['form_password_new']; ?></label>
-	              <input type="password" class="form-control" name="new" style="width:150px;">
+				  <div id="password-error-show" style="color:red"></div>
+	              <input type="password" class="form-control" name="new" style="width:150px;" minlength="6" required>
 	            </div>
 	            <div class="form-group">
 	              <label><?= $lang['from_password_new_repeat']; ?></label>
-	              <input type="password" class="form-control" name="rnew" style="width:150px">
+	              <input type="password" class="form-control" name="rnew" style="width:150px" required>
 	            </div>
 	            <div class="form-group">
 	              <button type="submit" class="btn btn-primary"><?= $lang['label_change_password']; ?></button>
@@ -163,4 +165,21 @@
 		</table>
 	</div>
 	</small>
-</div>
\ No newline at end of file
+</div>
+
+<script>
+function validateForm() {
+    var pass = document.forms["password-change-form"]["new"].value;
+	var passVerify = document.forms["password-change-form"]["rnew"].value;
+	
+	var errorShowDiv = document.getElementById("password-error-show");
+	
+	var passMatchError = "<?php echo $lang['error_passwords']?>";
+	
+    if (pass != passVerify) {
+		errorShowDiv.innerHTML = passMatchError;
+        return false;
+    }
+	
+}
+</script>
\ No newline at end of file
diff --git a/application/views/home/view_idea.php b/application/views/home/view_idea.php
index 181bc562..3f6b894f 100755
--- a/application/views/home/view_idea.php
+++ b/application/views/home/view_idea.php
@@ -12,10 +12,10 @@
 						<b><?php if($idea->votes <= 99999) {
 								if($idea->votes < 1000) echo $idea->votes;
 								else echo number_format($idea->votes);
-							} elseif($idea->votes < 1000000){ 
+							} elseif($idea->votes < 1000000){
 								echo (int) ($idea->votes / 1000); echo "k";
-							} else { 
-							echo (int) ($idea->votes / 1000000); 
+							} else {
+							echo (int) ($idea->votes / 1000000);
 							$t = (int) ($idea->votes / 1000000);
 							if((int) ($idea->votes / 100000) - $t*10 > 0)
 								echo "," . (((int) ($idea->votes / 100000)) - $t*10);
@@ -25,7 +25,7 @@
 						<div style="margin-top:-10px"><small><?php echo $lang['label_votes']; ?></small></div>
 					</div>
 					<div class="dropdown view-idea-vote">
-					  <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" style="width:100%"><?php echo $lang['label_vote']; ?></button>
+					  <button name="Vote" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" style="width:100%"><?php echo $lang['label_vote']; ?></button>
 					  <span class="dropdown-arrow dropdown-arrow-inverse"></span>
 					  <ul class="dropdown-menu dropdown-inverse">
 					    <li><a href="<?php echo base_url() . "action/vote/1/" . $idea->id;?>">1 <?php echo $lang['label_votes']; ?></a></li>
@@ -36,8 +36,8 @@
 				</div>
 				<div class="col-xs-12 col-sm-10">
 					<h6><?php echo $idea->title; ?></h6>
-					<span style="color:#34495E"><small><?php echo $idea->content; ?></small></span>
-					<div> 
+					<span style="color:#34495E"><small><?php echo nl2br($idea->content); ?></small></span>
+					<div>
 					<ul class="nav-pills" style="list-style:none;margin-left:-40px">
 					<li style="padding-right:10px"><span class="label label-<?php
 				switch ($idea->status) {
@@ -96,7 +96,7 @@
 				<ul class="nav-pills" style="list-style:none;margin-left:-40px;">
 				<li>
 					<?php if($idea->status == 'new'): ?>
-						<a href="<?php echo base_url() . 'adminaction/approveidea/' . $idea->id; ?>"><button type="submit" class="btn btn-success btn-sm" style="width:130px">Approve Idea</button></a>
+						<a href="<?php echo base_url() . 'adminaction/approveidea/' . $idea->id; ?>"><button type="submit" class="btn btn-success btn-sm" style="width:130px"><?php echo $lang['label_idea_approve']; ?></button></a>
 					<?php elseif($idea->status != 'completed' && $idea->status != 'declined'): ?>
 						<div class="dropdown">
 						  <button class="btn btn-info btn-sm dropdown-toggle" data-toggle="dropdown" style="width:130px"><?php echo $lang['label_change_status']; ?></button>
@@ -117,7 +117,7 @@
 				<li>
 					<a href="<?php echo base_url() . 'admin/users/' . $idea->authorid; ?>" target="_blank"><button type="submit" class="btn btn-danger btn-sm" style="width:130px"><?php echo $lang['label_ban_user']; ?></button></a>
 				</li>
-				
+
 				</ul>
 				</div>
 			</div>
@@ -128,11 +128,11 @@
 				<div class="col-md-10 col-md-offset-2" style="margin-top:10px">
 					<form role="form" method="post" action="<?php echo base_url() . 'action/comment/' . $idea->id; ?>">
 						<div class="form-group">
-							<label>Comment</label>
-							<textarea class="form-control" rows="4" name="content" style="margin-bottom:10px;"></textarea>
-							<input type="hidden" name="ideaname" value="<?php echo str_replace(" ", "-", $idea->title); ?>">
-							<button type="submit" class="btn btn-default pull-right"><?php echo $lang['label_submit']; ?></button>
-						</div>
+						  <label>Comment</label>
+						    <textarea class="form-control" rows="4" name="content"></textarea>
+						  </div>
+						  <input type="hidden" name="ideaname" value="<?php echo str_replace(" ", "-", $idea->title); ?>">
+						  <button type="submit" name="commentbutton" class="btn btn-default"><?php echo $lang['label_submit']; ?></button>
 					</form>
 				</div>
 			</div>
@@ -148,7 +148,7 @@
 							<span style="margin-left:15px;margin-right:5px">
 							<?php if(isset($_SESSION['phpback_isadmin']) && $_SESSION['phpback_isadmin']): ?>
 							<?php $temp = base_url() . 'adminaction/deletecomment/' . $comment->id; ?>
-								<a style="color:#E25F5F" href="#" onclick="popup_sure(<?php echo $lang['text_sure_delete_comment']; ?>,'<?php echo $temp; ?>');"><i><small><?php echo $lang['label_delete_comment']; ?></small></i></a>
+								<a style="color:#E25F5F" href="#" onclick="popup_sure('<?php echo $lang['text_sure_delete_comment']; ?>','<?php echo $temp; ?>');"><i><small><?php echo $lang['label_delete_comment']; ?></small></i></a>
 							<?php else: ?>
 								<a style="color:#E25F5F" href="<?php echo base_url() . 'action/flag/'. $comment->id . '/' . $idea->id . '/' . str_replace(" ", "-", $idea->title);?>"><i><small><?php echo $lang['text_flag_comment']; ?></small></i></a>
 							<?php endif;?>
diff --git a/install/database_tables.sql b/install/database_tables.sql
index f09bc83d..dbf58868 100644
--- a/install/database_tables.sql
+++ b/install/database_tables.sql
@@ -91,7 +91,7 @@ CREATE TABLE IF NOT EXISTS `users` (
   `pass` tinytext COLLATE utf8_unicode_ci NOT NULL,
   `votes` int(11) NOT NULL,
   `isadmin` tinyint(1) NOT NULL,
-  `banned` int(11) NOT NULL,
+  `banned` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `id` (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/install/index.php b/install/index.php
index ed922df5..0992a6bb 100644
--- a/install/index.php
+++ b/install/index.php
@@ -46,7 +46,7 @@
 <body>
 	<div class="login-screen">
 		<div class="login-form">
-		<form action="install1.php" method="POST" name="install-form">
+		<form action="install1.php" method="POST" name="install-form" onsubmit="return validateForm()">
 			<div class="phpback_logo">
 				<img src="../public/img/logo_free.png" />
 			</div>
@@ -61,11 +61,11 @@
             </div>
 		<?php endif; ?>
       <div class="form-group">
-              <input type="text" class="form-control login-field" value="" placeholder="MySQL hostname" id="hostname" name="hostname" />
+              <input type="text" class="form-control login-field" value="" placeholder="MySQL hostname" id="hostname" name="hostname" required/>
               <label class="login-field-icon" for="hostname"></label>
             </div>
             <div class="form-group">
-              <input type="text" class="form-control login-field" value="" placeholder="MySQL username" id="username" name="username" />
+              <input type="text" class="form-control login-field" value="" placeholder="MySQL username" id="username" name="username" required/>
               <label class="login-field-icon" for="username"></label>
             </div>
             <div class="form-group">
@@ -76,24 +76,26 @@
               <input type="text" class="form-control login-field" value="" placeholder="MySQL database*" id="database" name="database" />
               <label class="login-field-icon" for="database"></label>
             </div>
-            <small>* Left in blank for automatic database creation</small>
+            <small>*Leave blank for automatic database creation</small>
             <hr>
 
-            <h6>PHPBack installation</h6>
+			<h6>Create Admin account </h6>
             <div class="form-group">
-              <input type="text" class="form-control login-field" value="" placeholder="Admin Name" id="adminname" name="adminname" />
+              <input type="text" class="form-control login-field" value="" placeholder="Admin Name" id="adminname" name="adminname" required/>
               <label class="login-field-icon" for="adminname"></label>
             </div>
 			   <div class="form-group">
-              <input type="text" class="form-control login-field" value="" placeholder="Admin Email" id="adminemail" name="adminemail" />
+              <input type="text" class="form-control login-field" value="" placeholder="Admin Email" id="adminemail" name="adminemail" required/>
               <label class="login-field-icon" for="adminemail"></label>
             </div>
-			   <div class="form-group">
-              <input type="password" class="form-control login-field" value="" placeholder="Admin password" id="adminpass" name="adminpass" />
+			<div id="password-error-show" style="color:red"></div>
+				<div class="form-group">
+			   
+              <input type="password" class="form-control login-field" value="" placeholder="Admin password" id="adminpass" name="adminpass" minlength="6" required/>
               <label class="login-field-icon fui-lock" for="adminpass"></label>
             </div>
             <div class="form-group">
-              <input type="password" class="form-control login-field" value="" placeholder="Repeat admin password" id="adminrpass" name="adminrpass" />
+              <input type="password" class="form-control login-field" value="" placeholder="Repeat admin password" id="adminrpass" name="adminrpass" required/>
               <label class="login-field-icon fui-lock" for="adminrpass"></label>
             </div>
 
@@ -103,5 +105,22 @@
         </div>
         </div>
 </div>
+
+<script>
+function validateForm() {
+    var pass = document.forms["install-form"]["adminpass"].value;
+	var passVerify = document.forms["install-form"]["adminrpass"].value;
+	
+	var errorShowDiv = document.getElementById("password-error-show");
+	
+    if (pass != passVerify) {
+		errorShowDiv.innerHTML = "Passwords do not match";
+        return false;
+    }
+	
+}
+
+</script>
+
 </body>
 </html>
diff --git a/install/install1.php b/install/install1.php
old mode 100644
new mode 100755
index f58bcfeb..7730e87a
--- a/install/install1.php
+++ b/install/install1.php
@@ -63,7 +63,7 @@ function exitOnError($errorMessage) {
  * @param type $database
  */
 function createDbConfigFile($hostname, $username, $password, $database) {
-    @chmod('../application/config', 0777);
+    @chmod('../application/config', 0755);
     if (($file = fopen('../application/config/database.php', 'w+')) == FALSE) {
         exitOnError('ERROR #1: Config file could not be created');
     }
@@ -143,7 +143,7 @@ function createDbConfigFile($hostname, $username, $password, $database) {
 $result = $server->query("SELECT id FROM settings WHERE name='title'");
 
 if ($result->num_rows == 1) {
-    if (!@chmod('../install', 0777)) {
+    if (!@chmod('../install', 0755)) {
         echo "PLEASE DELETE install/ FOLDER MANUALLY. THEN GO TO yourwebsite.com/feedback/admin/ TO LOG IN.";
         exit;
     }
@@ -157,9 +157,9 @@ function createDbConfigFile($hostname, $username, $password, $database) {
     header('Location: ../admin');
     exit;
 } else {
-    $server->query("INSERT INTO users(id,name,email,pass,votes,isadmin,banned) VALUES('','" . $_POST['adminname'] . "','" . $_POST['adminemail'] . "','" . $hashing->hash($_POST['adminpass']) . "', 20, 3,0)");
+    $server->query("INSERT INTO users(name,email,pass,votes,isadmin,banned) VALUES('" . $_POST['adminname'] . "','" . $_POST['adminemail'] . "','" . $hashing->hash($_POST['adminpass']) . "', 20, 3,0)");
 
-    if (!@chmod('../install', 0777)) {
+    if (!@chmod('../install', 0755)) {
         $url = getBaseUrl();
         displayMessage("PLEASE DELETE install/index.php, install/install1.php AND install/database_tables.sql FILES MANUALLY.<br />
             THEN GO TO <a href='" . $url . "/install/index2.php'>yourwebsite.com/feedback/install/index2.php</a> TO CONTINUE THE INSTALLATION.");
diff --git a/install/install2.php b/install/install2.php
index 879c3a5c..7c4b87de 100644
--- a/install/install2.php
+++ b/install/install2.php
@@ -24,18 +24,20 @@
     exit(2);
 }
 
-$mysql->multi_query("INSERT INTO `settings` (`id`, `name`, `value`) VALUES
-('', 'recaptchapublic', '". $_POST['rpublic'] ."'),
-('', 'recaptchaprivate', '". $_POST['rprivate'] ."'),
-('', 'maxvotes', '". ((isset($_POST['maxvotes']) && $_POST['maxvotes'] != '')? $_POST['maxvotes'] : 20)."'),
-('', 'mainmail', '". $_POST['mainmail'] ."'),
-('', 'title', '". $_POST['title'] ."'),
-('', 'max_results', '".((isset($_POST['max_results']) && $_POST['max_results'] != '')? $_POST['max_results'] : 10)."'),
-('', 'language', '".(isset($_POST['language'])? $_POST['language'] : 'english')."'),
-('', 'smtp-host', '". $_POST['smtp-host'] ."'),
-('', 'smtp-port', '". $_POST['smtp-port'] ."'),
-('', 'smtp-user', '". $_POST['smtp-user'] ."'),
-('', 'smtp-pass', '". $_POST['smtp-password'] ."');");
+$mysql->multi_query("INSERT INTO `settings` (`name`, `value`) VALUES
+('title', '". $_POST['title'] ."'),
+('welcometext-title', 'Welcome to our feedback'),
+('welcometext-description', 'Here you can suggest ideas to improve our services or vote on ideas from other people'),
+('recaptchapublic', '". $_POST['rpublic'] ."'),
+('recaptchaprivate', '". $_POST['rprivate'] ."'),
+('language', '".(isset($_POST['language'])? $_POST['language'] : 'english')."'),
+('maxvotes', '". ((isset($_POST['maxvotes']) && $_POST['maxvotes'] != '')? $_POST['maxvotes'] : 20)."'),
+('mainmail', '". $_POST['mainmail'] ."'),
+('max_results', '".((isset($_POST['max_results']) && $_POST['max_results'] != '')? $_POST['max_results'] : 10)."'),
+('smtp-host', '". $_POST['smtp-host'] ."'),
+('smtp-port', '". $_POST['smtp-port'] ."'),
+('smtp-user', '". $_POST['smtp-user'] ."'),
+('smtp-pass', '". $_POST['smtp-password'] ."');");
 
 if(unlink('index2.php') && unlink('install2.php')) {
     header('Location: ../admin');
diff --git a/public/css/all.css b/public/css/all.css
index 81d8aed9..d1c7bb71 100644
--- a/public/css/all.css
+++ b/public/css/all.css
@@ -131,6 +131,9 @@ body {
 {
 	text-align:center;
 	font-size: 83%;
+	bottom: 0; 
+        position: fixed; 
+        width: 100%;
 }
 
 
diff --git a/public/recaptcha/LICENSE b/public/recaptcha/LICENSE
deleted file mode 100755
index b612f71f..00000000
--- a/public/recaptcha/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
-AUTHORS:
-  Mike Crawford
-  Ben Maurer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/public/recaptcha/ReCaptcha/ReCaptcha.php b/public/recaptcha/ReCaptcha/ReCaptcha.php
new file mode 100644
index 00000000..8939e84b
--- /dev/null
+++ b/public/recaptcha/ReCaptcha/ReCaptcha.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      https://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha;
+
+/**
+ * reCAPTCHA client.
+ */
+class ReCaptcha
+{
+    /**
+     * Version of this client library.
+     * @const string
+     */
+    const VERSION = 'php_1.2.1';
+
+    /**
+     * URL for reCAPTCHA sitevrerify API
+     * @const string
+     */
+    const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
+
+    /**
+     * Invalid JSON received
+     * @const string
+     */
+    const E_INVALID_JSON = 'invalid-json';
+
+    /**
+     * Could not connect to service
+     * @const string
+     */
+    const E_CONNECTION_FAILED = 'connection-failed';
+
+    /**
+     * Did not receive a 200 from the service
+     * @const string
+     */
+    const E_BAD_RESPONSE = 'bad-response';
+
+    /**
+     * Not a success, but no error codes received!
+     * @const string
+     */
+    const E_UNKNOWN_ERROR = 'unknown-error';
+
+    /**
+     * ReCAPTCHA response not provided
+     * @const string
+     */
+    const E_MISSING_INPUT_RESPONSE = 'missing-input-response';
+
+    /**
+     * Expected hostname did not match
+     * @const string
+     */
+    const E_HOSTNAME_MISMATCH = 'hostname-mismatch';
+
+    /**
+     * Expected APK package name did not match
+     * @const string
+     */
+    const E_APK_PACKAGE_NAME_MISMATCH = 'apk_package_name-mismatch';
+
+    /**
+     * Expected action did not match
+     * @const string
+     */
+    const E_ACTION_MISMATCH = 'action-mismatch';
+
+    /**
+     * Score threshold not met
+     * @const string
+     */
+    const E_SCORE_THRESHOLD_NOT_MET = 'score-threshold-not-met';
+
+    /**
+     * Challenge timeout
+     * @const string
+     */
+    const E_CHALLENGE_TIMEOUT = 'challenge-timeout';
+
+    /**
+     * Shared secret for the site.
+     * @var string
+     */
+    private $secret;
+
+    /**
+     * Method used to communicate with service. Defaults to POST request.
+     * @var RequestMethod
+     */
+    private $requestMethod;
+
+    /**
+     * Create a configured instance to use the reCAPTCHA service.
+     *
+     * @param string $secret The shared key between your site and reCAPTCHA.
+     * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
+     * @throws \RuntimeException if $secret is invalid
+     */
+    public function __construct($secret, RequestMethod $requestMethod = null)
+    {
+        if (empty($secret)) {
+            throw new \RuntimeException('No secret provided');
+        }
+
+        if (!is_string($secret)) {
+            throw new \RuntimeException('The provided secret must be a string');
+        }
+
+        $this->secret = $secret;
+        $this->requestMethod = (is_null($requestMethod)) ? new RequestMethod\Post() : $requestMethod;
+    }
+
+    /**
+     * Calls the reCAPTCHA siteverify API to verify whether the user passes
+     * CAPTCHA test and additionally runs any specified additional checks
+     *
+     * @param string $response The user response token provided by reCAPTCHA, verifying the user on your site.
+     * @param string $remoteIp The end user's IP address.
+     * @return Response Response from the service.
+     */
+    public function verify($response, $remoteIp = null)
+    {
+        // Discard empty solution submissions
+        if (empty($response)) {
+            $recaptchaResponse = new Response(false, array(self::E_MISSING_INPUT_RESPONSE));
+            return $recaptchaResponse;
+        }
+
+        $params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION);
+        $rawResponse = $this->requestMethod->submit($params);
+        $initialResponse = Response::fromJson($rawResponse);
+        $validationErrors = array();
+
+        if (isset($this->hostname) && strcasecmp($this->hostname, $initialResponse->getHostname()) !== 0) {
+            $validationErrors[] = self::E_HOSTNAME_MISMATCH;
+        }
+
+        if (isset($this->apkPackageName) && strcasecmp($this->apkPackageName, $initialResponse->getApkPackageName()) !== 0) {
+            $validationErrors[] = self::E_APK_PACKAGE_NAME_MISMATCH;
+        }
+
+        if (isset($this->action) && strcasecmp($this->action, $initialResponse->getAction()) !== 0) {
+            $validationErrors[] = self::E_ACTION_MISMATCH;
+        }
+
+        if (isset($this->threshold) && $this->threshold > $initialResponse->getScore()) {
+            $validationErrors[] = self::E_SCORE_THRESHOLD_NOT_MET;
+        }
+
+        if (isset($this->timeoutSeconds)) {
+            $challengeTs = strtotime($initialResponse->getChallengeTs());
+
+            if ($challengeTs > 0 && time() - $challengeTs > $this->timeoutSeconds) {
+                $validationErrors[] = self::E_CHALLENGE_TIMEOUT;
+            }
+        }
+
+        if (empty($validationErrors)) {
+            return $initialResponse;
+        }
+
+        return new Response(
+            false,
+            array_merge($initialResponse->getErrorCodes(), $validationErrors),
+            $initialResponse->getHostname(),
+            $initialResponse->getChallengeTs(),
+            $initialResponse->getApkPackageName(),
+            $initialResponse->getScore(),
+            $initialResponse->getAction()
+        );
+    }
+
+    /**
+     * Provide a hostname to match against in verify()
+     * This should be without a protocol or trailing slash, e.g. www.google.com
+     *
+     * @param string $hostname Expected hostname
+     * @return ReCaptcha Current instance for fluent interface
+     */
+    public function setExpectedHostname($hostname)
+    {
+        $this->hostname = $hostname;
+        return $this;
+    }
+
+    /**
+     * Provide an APK package name to match against in verify()
+     *
+     * @param string $apkPackageName Expected APK package name
+     * @return ReCaptcha Current instance for fluent interface
+     */
+    public function setExpectedApkPackageName($apkPackageName)
+    {
+        $this->apkPackageName = $apkPackageName;
+        return $this;
+    }
+
+    /**
+     * Provide an action to match against in verify()
+     * This should be set per page.
+     *
+     * @param string $action Expected action
+     * @return ReCaptcha Current instance for fluent interface
+     */
+    public function setExpectedAction($action)
+    {
+        $this->action = $action;
+        return $this;
+    }
+
+    /**
+     * Provide a threshold to meet or exceed in verify()
+     * Threshold should be a float between 0 and 1 which will be tested as response >= threshold.
+     *
+     * @param float $threshold Expected threshold
+     * @return ReCaptcha Current instance for fluent interface
+     */
+    public function setScoreThreshold($threshold)
+    {
+        $this->threshold = floatval($threshold);
+        return $this;
+    }
+
+    /**
+     * Provide a timeout in seconds to test against the challenge timestamp in verify()
+     *
+     * @param int $timeoutSeconds Expected hostname
+     * @return ReCaptcha Current instance for fluent interface
+     */
+    public function setChallengeTimeout($timeoutSeconds)
+    {
+        $this->timeoutSeconds = $timeoutSeconds;
+        return $this;
+    }
+}
diff --git a/public/recaptcha/ReCaptcha/RequestMethod.php b/public/recaptcha/ReCaptcha/RequestMethod.php
new file mode 100644
index 00000000..2fd94b3b
--- /dev/null
+++ b/public/recaptcha/ReCaptcha/RequestMethod.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      https://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha;
+
+/**
+ * Method used to send the request to the service.
+ */
+interface RequestMethod
+{
+
+    /**
+     * Submit the request with the specified parameters.
+     *
+     * @param RequestParameters $params Request parameters
+     * @return string Body of the reCAPTCHA response
+     */
+    public function submit(RequestParameters $params);
+}
diff --git a/public/recaptcha/ReCaptcha/RequestMethod/Curl.php b/public/recaptcha/ReCaptcha/RequestMethod/Curl.php
new file mode 100644
index 00000000..3d8dddd1
--- /dev/null
+++ b/public/recaptcha/ReCaptcha/RequestMethod/Curl.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      https://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha\RequestMethod;
+
+/**
+ * Convenience wrapper around the cURL functions to allow mocking.
+ */
+class Curl
+{
+
+    /**
+     * @see http://php.net/curl_init
+     * @param string $url
+     * @return resource cURL handle
+     */
+    public function init($url = null)
+    {
+        return curl_init($url);
+    }
+
+    /**
+     * @see http://php.net/curl_setopt_array
+     * @param resource $ch
+     * @param array $options
+     * @return bool
+     */
+    public function setoptArray($ch, array $options)
+    {
+        return curl_setopt_array($ch, $options);
+    }
+
+    /**
+     * @see http://php.net/curl_exec
+     * @param resource $ch
+     * @return mixed
+     */
+    public function exec($ch)
+    {
+        return curl_exec($ch);
+    }
+
+    /**
+     * @see http://php.net/curl_close
+     * @param resource $ch
+     */
+    public function close($ch)
+    {
+        curl_close($ch);
+    }
+}
diff --git a/public/recaptcha/ReCaptcha/RequestMethod/CurlPost.php b/public/recaptcha/ReCaptcha/RequestMethod/CurlPost.php
new file mode 100644
index 00000000..59886f8a
--- /dev/null
+++ b/public/recaptcha/ReCaptcha/RequestMethod/CurlPost.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      https://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha\RequestMethod;
+
+use ReCaptcha\ReCaptcha;
+use ReCaptcha\RequestMethod;
+use ReCaptcha\RequestParameters;
+
+/**
+ * Sends cURL request to the reCAPTCHA service.
+ * Note: this requires the cURL extension to be enabled in PHP
+ * @see http://php.net/manual/en/book.curl.php
+ */
+class CurlPost implements RequestMethod
+{
+    /**
+     * Curl connection to the reCAPTCHA service
+     * @var Curl
+     */
+    private $curl;
+
+    /**
+     * URL for reCAPTCHA sitevrerify API
+     * @var string
+     */
+    private $siteVerifyUrl;
+
+    /**
+     * Only needed if you want to override the defaults
+     *
+     * @param Curl $curl Curl resource
+     * @param string $siteVerifyUrl URL for reCAPTCHA sitevrerify API
+     */
+    public function __construct(Curl $curl = null, $siteVerifyUrl = null)
+    {
+        $this->curl = (is_null($curl)) ? new Curl() : $curl;
+        $this->siteVerifyUrl = (is_null($siteVerifyUrl)) ? ReCaptcha::SITE_VERIFY_URL : $siteVerifyUrl;
+    }
+
+    /**
+     * Submit the cURL request with the specified parameters.
+     *
+     * @param RequestParameters $params Request parameters
+     * @return string Body of the reCAPTCHA response
+     */
+    public function submit(RequestParameters $params)
+    {
+        $handle = $this->curl->init($this->siteVerifyUrl);
+
+        $options = array(
+            CURLOPT_POST => true,
+            CURLOPT_POSTFIELDS => $params->toQueryString(),
+            CURLOPT_HTTPHEADER => array(
+                'Content-Type: application/x-www-form-urlencoded'
+            ),
+            CURLINFO_HEADER_OUT => false,
+            CURLOPT_HEADER => false,
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_SSL_VERIFYPEER => true
+        );
+        $this->curl->setoptArray($handle, $options);
+
+        $response = $this->curl->exec($handle);
+        $this->curl->close($handle);
+
+        if ($response !== false) {
+            return $response;
+        }
+
+        return '{"success": false, "error-codes": ["'.ReCaptcha::E_CONNECTION_FAILED.'"]}';
+    }
+}
diff --git a/public/recaptcha/ReCaptcha/RequestMethod/Post.php b/public/recaptcha/ReCaptcha/RequestMethod/Post.php
new file mode 100644
index 00000000..9e265821
--- /dev/null
+++ b/public/recaptcha/ReCaptcha/RequestMethod/Post.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      https://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha\RequestMethod;
+
+use ReCaptcha\ReCaptcha;
+use ReCaptcha\RequestMethod;
+use ReCaptcha\RequestParameters;
+
+/**
+ * Sends POST requests to the reCAPTCHA service.
+ */
+class Post implements RequestMethod
+{
+    /**
+     * URL for reCAPTCHA sitevrerify API
+     * @var string
+     */
+    private $siteVerifyUrl;
+
+    /**
+     * Only needed if you want to override the defaults
+     *
+     * @param string $siteVerifyUrl URL for reCAPTCHA sitevrerify API
+     */
+    public function __construct($siteVerifyUrl = null)
+    {
+        $this->siteVerifyUrl = (is_null($siteVerifyUrl)) ? ReCaptcha::SITE_VERIFY_URL : $siteVerifyUrl;
+    }
+
+    /**
+     * Submit the POST request with the specified parameters.
+     *
+     * @param RequestParameters $params Request parameters
+     * @return string Body of the reCAPTCHA response
+     */
+    public function submit(RequestParameters $params)
+    {
+        $options = array(
+            'http' => array(
+                'header' => "Content-type: application/x-www-form-urlencoded\r\n",
+                'method' => 'POST',
+                'content' => $params->toQueryString(),
+                // Force the peer to validate (not needed in 5.6.0+, but still works)
+                'verify_peer' => true,
+            ),
+        );
+        $context = stream_context_create($options);
+        $response = file_get_contents($this->siteVerifyUrl, false, $context);
+
+        if ($response !== false) {
+            return $response;
+        }
+
+        return '{"success": false, "error-codes": ["'.ReCaptcha::E_CONNECTION_FAILED.'"]}';
+    }
+}
diff --git a/public/recaptcha/ReCaptcha/RequestMethod/Socket.php b/public/recaptcha/ReCaptcha/RequestMethod/Socket.php
new file mode 100644
index 00000000..12322e8c
--- /dev/null
+++ b/public/recaptcha/ReCaptcha/RequestMethod/Socket.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      https://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha\RequestMethod;
+
+/**
+ * Convenience wrapper around native socket and file functions to allow for
+ * mocking.
+ */
+class Socket
+{
+    private $handle = null;
+
+    /**
+     * fsockopen
+     *
+     * @see http://php.net/fsockopen
+     * @param string $hostname
+     * @param int $port
+     * @param int $errno
+     * @param string $errstr
+     * @param float $timeout
+     * @return resource
+     */
+    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
+    {
+        $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
+
+        if ($this->handle != false && $errno === 0 && $errstr === '') {
+            return $this->handle;
+        }
+        return false;
+    }
+
+    /**
+     * fwrite
+     *
+     * @see http://php.net/fwrite
+     * @param string $string
+     * @param int $length
+     * @return int | bool
+     */
+    public function fwrite($string, $length = null)
+    {
+        return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
+    }
+
+    /**
+     * fgets
+     *
+     * @see http://php.net/fgets
+     * @param int $length
+     * @return string
+     */
+    public function fgets($length = null)
+    {
+        return fgets($this->handle, $length);
+    }
+
+    /**
+     * feof
+     *
+     * @see http://php.net/feof
+     * @return bool
+     */
+    public function feof()
+    {
+        return feof($this->handle);
+    }
+
+    /**
+     * fclose
+     *
+     * @see http://php.net/fclose
+     * @return bool
+     */
+    public function fclose()
+    {
+        return fclose($this->handle);
+    }
+}
diff --git a/public/recaptcha/ReCaptcha/RequestMethod/SocketPost.php b/public/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
new file mode 100644
index 00000000..ca1ca907
--- /dev/null
+++ b/public/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      https://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha\RequestMethod;
+
+use ReCaptcha\ReCaptcha;
+use ReCaptcha\RequestMethod;
+use ReCaptcha\RequestParameters;
+
+/**
+ * Sends a POST request to the reCAPTCHA service, but makes use of fsockopen()
+ * instead of get_file_contents(). This is to account for people who may be on
+ * servers where allow_url_open is disabled.
+ */
+class SocketPost implements RequestMethod
+{
+    /**
+     * Socket to the reCAPTCHA service
+     * @var Socket
+     */
+    private $socket;
+
+    /**
+     * Only needed if you want to override the defaults
+     *
+     * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing
+     * @param string $siteVerifyUrl URL for reCAPTCHA sitevrerify API
+     */
+    public function __construct(Socket $socket = null, $siteVerifyUrl = null)
+    {
+        $this->socket = (is_null($socket)) ? new Socket() : $socket;
+        $this->siteVerifyUrl = (is_null($siteVerifyUrl)) ? ReCaptcha::SITE_VERIFY_URL : $siteVerifyUrl;
+    }
+
+    /**
+     * Submit the POST request with the specified parameters.
+     *
+     * @param RequestParameters $params Request parameters
+     * @return string Body of the reCAPTCHA response
+     */
+    public function submit(RequestParameters $params)
+    {
+        $errno = 0;
+        $errstr = '';
+        $urlParsed = parse_url($this->siteVerifyUrl);
+
+        if (false === $this->socket->fsockopen('ssl://' . $urlParsed['host'], 443, $errno, $errstr, 30)) {
+            return '{"success": false, "error-codes": ["'.ReCaptcha::E_CONNECTION_FAILED.'"]}';
+        }
+
+        $content = $params->toQueryString();
+
+        $request = "POST " . $urlParsed['path'] . " HTTP/1.1\r\n";
+        $request .= "Host: " . $urlParsed['host'] . "\r\n";
+        $request .= "Content-Type: application/x-www-form-urlencoded\r\n";
+        $request .= "Content-length: " . strlen($content) . "\r\n";
+        $request .= "Connection: close\r\n\r\n";
+        $request .= $content . "\r\n\r\n";
+
+        $this->socket->fwrite($request);
+        $response = '';
+
+        while (!$this->socket->feof()) {
+            $response .= $this->socket->fgets(4096);
+        }
+
+        $this->socket->fclose();
+
+        if (0 !== strpos($response, 'HTTP/1.1 200 OK')) {
+            return '{"success": false, "error-codes": ["'.ReCaptcha::E_BAD_RESPONSE.'"]}';
+        }
+
+        $parts = preg_split("#\n\s*\n#Uis", $response);
+
+        return $parts[1];
+    }
+}
diff --git a/public/recaptcha/ReCaptcha/RequestParameters.php b/public/recaptcha/ReCaptcha/RequestParameters.php
new file mode 100644
index 00000000..b6dd998d
--- /dev/null
+++ b/public/recaptcha/ReCaptcha/RequestParameters.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      https://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha;
+
+/**
+ * Stores and formats the parameters for the request to the reCAPTCHA service.
+ */
+class RequestParameters
+{
+    /**
+     * The shared key between your site and reCAPTCHA.
+     * @var string
+     */
+    private $secret;
+
+    /**
+     * The user response token provided by reCAPTCHA, verifying the user on your site.
+     * @var string
+     */
+    private $response;
+
+    /**
+     * Remote user's IP address.
+     * @var string
+     */
+    private $remoteIp;
+
+    /**
+     * Client version.
+     * @var string
+     */
+    private $version;
+
+    /**
+     * Initialise parameters.
+     *
+     * @param string $secret Site secret.
+     * @param string $response Value from g-captcha-response form field.
+     * @param string $remoteIp User's IP address.
+     * @param string $version Version of this client library.
+     */
+    public function __construct($secret, $response, $remoteIp = null, $version = null)
+    {
+        $this->secret = $secret;
+        $this->response = $response;
+        $this->remoteIp = $remoteIp;
+        $this->version = $version;
+    }
+
+    /**
+     * Array representation.
+     *
+     * @return array Array formatted parameters.
+     */
+    public function toArray()
+    {
+        $params = array('secret' => $this->secret, 'response' => $this->response);
+
+        if (!is_null($this->remoteIp)) {
+            $params['remoteip'] = $this->remoteIp;
+        }
+
+        if (!is_null($this->version)) {
+            $params['version'] = $this->version;
+        }
+
+        return $params;
+    }
+
+    /**
+     * Query string representation for HTTP request.
+     *
+     * @return string Query string formatted parameters.
+     */
+    public function toQueryString()
+    {
+        return http_build_query($this->toArray(), '', '&');
+    }
+}
diff --git a/public/recaptcha/ReCaptcha/Response.php b/public/recaptcha/ReCaptcha/Response.php
new file mode 100644
index 00000000..5c15c372
--- /dev/null
+++ b/public/recaptcha/ReCaptcha/Response.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      https://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha;
+
+/**
+ * The response returned from the service.
+ */
+class Response
+{
+    /**
+     * Success or failure.
+     * @var boolean
+     */
+    private $success = false;
+
+    /**
+     * Error code strings.
+     * @var array
+     */
+    private $errorCodes = array();
+
+    /**
+     * The hostname of the site where the reCAPTCHA was solved.
+     * @var string
+     */
+    private $hostname;
+
+    /**
+     * Timestamp of the challenge load (ISO format yyyy-MM-dd'T'HH:mm:ssZZ)
+     * @var string
+     */
+    private $challengeTs;
+
+    /**
+     * APK package name
+     * @var string
+     */
+    private $apkPackageName;
+
+    /**
+     * Score assigned to the request
+     * @var float
+     */
+    private $score;
+
+    /**
+     * Action as specified by the page
+     * @var string
+     */
+    private $action;
+
+    /**
+     * Build the response from the expected JSON returned by the service.
+     *
+     * @param string $json
+     * @return \ReCaptcha\Response
+     */
+    public static function fromJson($json)
+    {
+        $responseData = json_decode($json, true);
+
+        if (!$responseData) {
+            return new Response(false, array(ReCaptcha::E_INVALID_JSON));
+        }
+
+        $hostname = isset($responseData['hostname']) ? $responseData['hostname'] : null;
+        $challengeTs = isset($responseData['challenge_ts']) ? $responseData['challenge_ts'] : null;
+        $apkPackageName = isset($responseData['apk_package_name']) ? $responseData['apk_package_name'] : null;
+        $score = isset($responseData['score']) ? floatval($responseData['score']) : null;
+        $action = isset($responseData['action']) ? $responseData['action'] : null;
+
+        if (isset($responseData['success']) && $responseData['success'] == true) {
+            return new Response(true, array(), $hostname, $challengeTs, $apkPackageName, $score, $action);
+        }
+
+        if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) {
+            return new Response(false, $responseData['error-codes'], $hostname, $challengeTs, $apkPackageName, $score, $action);
+        }
+
+        return new Response(false, array(ReCaptcha::E_UNKNOWN_ERROR), $hostname, $challengeTs, $apkPackageName, $score, $action);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param boolean $success
+     * @param string $hostname
+     * @param string $challengeTs
+     * @param string $apkPackageName
+     * @param float $score
+     * @param strong $action
+     * @param array $errorCodes
+     */
+    public function __construct($success, array $errorCodes = array(), $hostname = null, $challengeTs = null, $apkPackageName = null, $score = null, $action = null)
+    {
+        $this->success = $success;
+        $this->hostname = $hostname;
+        $this->challengeTs = $challengeTs;
+        $this->apkPackageName = $apkPackageName;
+        $this->score = $score;
+        $this->action = $action;
+        $this->errorCodes = $errorCodes;
+    }
+
+    /**
+     * Is success?
+     *
+     * @return boolean
+     */
+    public function isSuccess()
+    {
+        return $this->success;
+    }
+
+    /**
+     * Get error codes.
+     *
+     * @return array
+     */
+    public function getErrorCodes()
+    {
+        return $this->errorCodes;
+    }
+
+    /**
+     * Get hostname.
+     *
+     * @return string
+     */
+    public function getHostname()
+    {
+        return $this->hostname;
+    }
+
+    /**
+     * Get challenge timestamp
+     *
+     * @return string
+     */
+    public function getChallengeTs()
+    {
+        return $this->challengeTs;
+    }
+
+    /**
+     * Get APK package name
+     *
+     * @return string
+     */
+    public function getApkPackageName()
+    {
+        return $this->apkPackageName;
+    }
+    /**
+     * Get score
+     *
+     * @return float
+     */
+    public function getScore()
+    {
+        return $this->score;
+    }
+
+    /**
+     * Get action
+     *
+     * @return string
+     */
+    public function getAction()
+    {
+        return $this->action;
+    }
+
+    public function toArray()
+    {
+        return array(
+            'success' => $this->isSuccess(),
+            'hostname' => $this->getHostname(),
+            'challenge_ts' => $this->getChallengeTs(),
+            'apk_package_name' => $this->getApkPackageName(),
+            'score' => $this->getScore(),
+            'action' => $this->getAction(),
+            'error-codes' => $this->getErrorCodes(),
+        );
+    }
+}
diff --git a/public/recaptcha/autoload.php b/public/recaptcha/autoload.php
new file mode 100644
index 00000000..95e249e9
--- /dev/null
+++ b/public/recaptcha/autoload.php
@@ -0,0 +1,40 @@
+<?php
+
+/* An autoloader for ReCaptcha\Foo classes. This should be required()
+ * by the user before attempting to instantiate any of the ReCaptcha
+ * classes.
+ */
+
+spl_autoload_register(function ($class) {
+    if (substr($class, 0, 10) !== 'ReCaptcha\\') {
+        /* If the class does not lie under the "ReCaptcha" namespace,
+         * then we can exit immediately.
+         */
+        return;
+    }
+
+    /* All of the classes have names like "ReCaptcha\Foo", so we need
+     * to replace the backslashes with frontslashes if we want the
+     * name to map directly to a location in the filesystem.
+     */
+    $class = str_replace('\\', '/', $class);
+
+    /* First, check under the current directory. It is important that
+     * we look here first, so that we don't waste time searching for
+     * test classes in the common case.
+     */
+    $path = dirname(__FILE__).'/'.$class.'.php';
+    if (is_readable($path)) {
+        require_once $path;
+
+        return;
+    }
+
+    /* If we didn't find what we're looking for already, maybe it's
+     * a test class?
+     */
+    $path = dirname(__FILE__).'/../tests/'.$class.'.php';
+    if (is_readable($path)) {
+        require_once $path;
+    }
+});
diff --git a/public/recaptcha/recaptchalib.php b/public/recaptcha/recaptchalib.php
deleted file mode 100755
index 76bbd7d8..00000000
--- a/public/recaptcha/recaptchalib.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/*
- * This is a PHP library that handles calling reCAPTCHA.
- *    - Documentation and latest version
- *          http://recaptcha.net/plugins/php/
- *    - Get a reCAPTCHA API Key
- *          https://www.google.com/recaptcha/admin/create
- *    - Discussion group
- *          http://groups.google.com/group/recaptcha
- *
- * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
- * AUTHORS:
- *   Mike Crawford
- *   Ben Maurer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * The reCAPTCHA server URL's
- */
-define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
-define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
-define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
-
-/**
- * Encodes the given data into a query string format
- * @param $data - array of string elements to be encoded
- * @return string - encoded request
- */
-function _recaptcha_qsencode($data) {
-	$req = "";
-	foreach ($data as $key => $value) {
-		$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
-	}
-
-	// Cut the last '&'
-	$req = substr($req, 0, strlen($req) - 1);
-	return $req;
-}
-
-/**
- * Submits an HTTP POST to a reCAPTCHA server
- * @param string $host
- * @param string $path
- * @param array $data
- * @param int port
- * @return array response
- */
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
-
-	$req = _recaptcha_qsencode($data);
-
-	$http_request = "POST $path HTTP/1.0\r\n";
-	$http_request .= "Host: $host\r\n";
-	$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-	$http_request .= "Content-Length: " . strlen($req) . "\r\n";
-	$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-	$http_request .= "\r\n";
-	$http_request .= $req;
-
-	$response = '';
-	if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
-		die('Could not open socket');
-	}
-
-	fwrite($fs, $http_request);
-
-	while (!feof($fs)) {
-		$response .= fgets($fs, 1160);
-	}
-	// One TCP-IP packet
-	fclose($fs);
-	$response = explode("\r\n\r\n", $response, 2);
-
-	return $response;
-}
-
-/**
- * Gets the challenge HTML (javascript and non-javascript version).
- * This is called from the browser, and the resulting reCAPTCHA HTML widget
- * is embedded within the HTML form it was called from.
- * @param string $pubkey A public key for reCAPTCHA
- * @param string $error The error given by reCAPTCHA (optional, default is null)
- * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
- * @return string - The HTML to be embedded in the user's form.
- */
-function recaptcha_get_html($pubkey, $error = null, $use_ssl = false) {
-	if ($pubkey == null || $pubkey == '') {
-		die("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
-
-	if ($use_ssl) {
-		$server = RECAPTCHA_API_SECURE_SERVER;
-	} else {
-		$server = RECAPTCHA_API_SERVER;
-	}
-
-	$errorpart = "";
-	if ($error) {
-		$errorpart = "&amp;error=" . $error;
-	}
-	return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
-
-	<noscript>
-  		<iframe src="' . $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-	</noscript>';
-}
-
-/**
- * A ReCaptchaResponse is returned from recaptcha_check_answer()
- */
-class ReCaptchaResponse {
-	var $is_valid;
-	var $error;
-}
-
-/**
- * Calls an HTTP POST function to verify if the user's guess was correct
- * @param string $privkey
- * @param string $remoteip
- * @param string $challenge
- * @param string $response
- * @param array $extra_params an array of extra variables to post to the server
- * @return ReCaptchaResponse
- */
-function recaptcha_check_answer($privkey, $remoteip, $challenge, $response, $extra_params = array()) {
-	if ($privkey == null || $privkey == '') {
-		die("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
-
-	if ($remoteip == null || $remoteip == '') {
-		die("For security reasons, you must pass the remote ip to reCAPTCHA");
-	}
-
-	//discard spam submissions
-	if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
-		$recaptcha_response = new ReCaptchaResponse();
-		$recaptcha_response->is_valid = false;
-		$recaptcha_response->error = 'incorrect-captcha-sol';
-		return $recaptcha_response;
-	}
-
-	$response = _recaptcha_http_post(RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-		array(
-			'privatekey' => $privkey,
-			'remoteip' => $remoteip,
-			'challenge' => $challenge,
-			'response' => $response,
-		) + $extra_params
-	);
-
-	$answers = explode("\n", $response[1]);
-	$recaptcha_response = new ReCaptchaResponse();
-
-	if (trim($answers[0]) == 'true') {
-		$recaptcha_response->is_valid = true;
-	} else {
-		$recaptcha_response->is_valid = false;
-		$recaptcha_response->error = $answers[1];
-	}
-	return $recaptcha_response;
-
-}
-
-/**
- * gets a URL where the user can sign up for reCAPTCHA. If your application
- * has a configuration page where you enter a key, you should provide a link
- * using this function.
- * @param string $domain The domain where the page is hosted
- * @param string $appname The name of your application
- */
-function recaptcha_get_signup_url($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode(array('domains' => $domain, 'app' => $appname));
-}
-
-function _recaptcha_aes_pad($val) {
-	$block_size = 16;
-	$numpad = $block_size - (strlen($val) % $block_size);
-	return str_pad($val, strlen($val) + $numpad, chr($numpad));
-}
-
-/* Mailhide related code */
-
-function _recaptcha_aes_encrypt($val, $ky) {
-	if (!function_exists("mcrypt_encrypt")) {
-		die("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
-	}
-	$mode = MCRYPT_MODE_CBC;
-	$enc = MCRYPT_RIJNDAEL_128;
-	$val = _recaptcha_aes_pad($val);
-	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-}
-
-function _recaptcha_mailhide_urlbase64($x) {
-	return strtr(base64_encode($x), '+/', '-_');
-}
-
-/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-function recaptcha_mailhide_url($pubkey, $privkey, $email) {
-	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-		die("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-			"you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
-	}
-
-	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt($email, $ky);
-
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64($cryptmail);
-}
-
-/**
- * gets the parts of the email to expose to the user.
- * eg, given johndoe@example,com return ["john", "example.com"].
- * the email is then displayed as john...@example.com
- */
-function _recaptcha_mailhide_email_parts($email) {
-	$arr = preg_split("/@/", $email);
-
-	if (strlen($arr[0]) <= 4) {
-		$arr[0] = substr($arr[0], 0, 1);
-	} else if (strlen($arr[0]) <= 6) {
-		$arr[0] = substr($arr[0], 0, 3);
-	} else {
-		$arr[0] = substr($arr[0], 0, 4);
-	}
-	return $arr;
-}
-
-/**
- * Gets html to display an email address given a public an private key.
- * to get a key, go to:
- *
- * http://www.google.com/recaptcha/mailhide/apikey
- */
-function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts($email);
-	$url = recaptcha_mailhide_url($pubkey, $privkey, $email);
-
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities($url) .
-	"' onclick=\"window.open('" . htmlentities($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities($emailparts[1]);
-
-}
-
-?>
diff --git a/run_tests.sh b/run_tests.sh
index 472c427e..4a9c9c25 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -19,5 +19,4 @@ gnome-terminal -e 'java -jar /usr/local/bin/selenium-server-standalone-2.48.2.ja
 # RUN TESTS
 phpunit --colors tests/cases/InstallTest.php
 phpunit --colors tests/cases/AdminPanelTest.php
-#phpunit --colors tests/cases/UserTest.php
-#phpunit --colors tests/cases/PostingTest.php
+phpunit --colors tests/cases/UserTest.php
diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php
index 79b82c73..da04ee68 100755
--- a/system/language/english/db_lang.php
+++ b/system/language/english/db_lang.php
@@ -2,8 +2,8 @@
 
 $lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
 $lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
+$lang['db_unable_to_select'] = 'Unable to connect to the database.';
+$lang['db_unable_to_create'] = 'Unable to create the database.';
 $lang['db_invalid_query'] = 'The query you submitted is not valid.';
 $lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
 $lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
@@ -26,4 +26,4 @@
 $lang['db_error_heading'] = 'A Database Error Occurred';
 
 /* End of file db_lang.php */
-/* Location: ./system/language/english/db_lang.php */
\ No newline at end of file
+/* Location: ./system/language/english/db_lang.php */
diff --git a/tests/cases/AdminPanelTest.php b/tests/cases/AdminPanelTest.php
index 92599912..0a9ad9ef 100644
--- a/tests/cases/AdminPanelTest.php
+++ b/tests/cases/AdminPanelTest.php
@@ -21,19 +21,12 @@ public function testLoginAdmin() {
     }
 
     public function testCategoryCreation() {
-        Scripts::LoginAdmin();
-        $this->byLinkText('System Settings')->click();
-        $this->byLinkText('Categories')->click();
-
-        $this->fillFields(array(
-            'name' => 'Value Name',
-            'description' => 'Value Category Description'
-        ));
-        $this->byName('add-category')->click();
+        Scripts::CreateCategory();
         $category=RedBean::load('categories',1);
-        $this->assertEquals($category->name, 'Value Name');
+        $this->assertEquals($category->name, 'Amsterdam');
         $this->assertEquals($category->description, 'Value Category Description');
     }
+
     public function testCategoryChangeName() {
         Scripts::LoginAdmin();
         $this->byLinkText('System Settings')->click();
@@ -42,49 +35,54 @@ public function testCategoryChangeName() {
               'category-1' => 'New Name'
         ));
         $this->byName('update-names')->click();
-        $category=RedBean::load('categories',1);
-        $this->assertEquals($category->name,'New Name');
+        $category = RedBean::load('categories',1);
+        $this->assertEquals('New Name', $category->name);
 
     }
+
     public function testCategoryDeletion() {
-        Scripts::LoginAdmin();
+        Scripts::CreateCategory('Berlin');
         $this->byLinkText('System Settings')->click();
         $this->byLinkText('Categories')->click();
         $this->byName('delete-ideas')->click();
         $this->byName('delete-category')->click();
         $numberOfCategories=RedBean::count('categories');
-        $this->assertEquals($numberOfCategories,0);
+        $this->assertEquals($numberOfCategories,1);
     }
 
     public function testGeneralSettings() {
         Scripts::LoginAdmin();
         $this->byLinkText('System Settings')->click();
         $this->fillFields(array(
-                //  //'setting-1' => 'newrecaptchapublic',
-                //'setting-2' => 'newrecaptchaprivate',
-                'setting-3' => '50',
-                'setting-4' => 'newmail@phpback.org',
-                'setting-5' => 'new tittle',
-                'setting-6' => '50',
-                //  'setting-7' => 'spanish',
-                'setting-8' => '50',
+                'setting-1' => 'new title',
+                'setting-2' => 'new welcome title',
+                'setting-3' => 'new welcome description',
+                //'setting-4' => 'newrecaptchapublic',
+                //'setting-5' => 'newrecaptchaprivate',
+                //'setting-6' => 'spanish',
+                'setting-7' => '50',
+                //'setting-8' => 'admin@phpback.org',
                 'setting-9' => '50',
-                'setting-10' => 'newsmtp-user',
-                'setting-11' => 'newsmtp-pass'
+                //'setting-10' => 'newsmtp-host',
+                'setting-11' => '50',
+                'setting-12' => 'newsmtp-user',
+                'setting-13' => 'newsmtp-pass'
         ));
         $this->byName('submit-changes')->click();
-
+/*
         $recaptchapublic = RedBean::load('settings',1);
         $recaptchaprivate = RedBean::load('settings',2);
         $maxvotes = RedBean::load('settings',3);
-        $mainmail = RedBean::load('settings',4);
-        $title = RedBean::load('settings',5);
+        $recaptchapublic = RedBean::load('settings',4);
+        $recaptchaprivate = RedBean::load('settings',5);
         $max_results = RedBean::load('settings',6);
         $language = RedBean::load('settings',7);
         $smtphost = RedBean::load('settings',8);
         $smtpport = RedBean::load('settings',9);
         $smtpuser = RedBean::load('settings',10);
         $smtppass = RedBean::load('settings',11);
+        $smtppass = RedBean::load('settings',12);
+        $smtppass = RedBean::load('settings',13);
 
         //$this->assertEquals($recaptchapublic->value,'newrecaptchapublic');
         //$this->assertEquals($recaptchaprivate->value,'newrecaptchaprivate');
@@ -97,6 +95,7 @@ public function testGeneralSettings() {
         $this->assertEquals($smtpport->value,'50');
         $this->assertEquals($smtpuser->value,'newsmtp-user');
         $this->assertEquals($smtppass->value,'newsmtp-pass');
+*/
     }
     public function testCreateAdmin(){
             Scripts::CreateUser();
@@ -111,7 +110,6 @@ public function testCreateAdmin(){
             $userCreated = RedBean::load('users',2);
             $this->assertEquals($userCreated->isadmin,'2');
     }
-
     public function testBanUser() {
         Scripts::CreateUser('turing@phpback.org','Alan turing','turing123');
         Scripts::LoginAdmin();
@@ -123,8 +121,16 @@ public function testBanUser() {
             'days' => '10'
         ));
         $this->byName('banuser')->click();
-        $userbanned = RedBean::load('users',3);
         date_default_timezone_set('America/Los_Angeles');
+        $userbanned = RedBean::load('users',3);
         $this->assertEquals($userbanned->banned,date('Ymd', strtotime('+10 days')));
     }
+    public function testDisableBanUser() {
+        Scripts::LoginAdmin();
+        $this->byLinkText('Users Management')->click();
+        $this->byLinkText('Banned List')->click();
+        $this->byLinkText('Disable ban')->click();
+        $passdisbann= RedBean::load('users',3);
+        $this->assertEquals($passdisbann->banned,'0');
+    }
 }
diff --git a/tests/cases/UserTest.php b/tests/cases/UserTest.php
index 37f005cb..9729b7eb 100644
--- a/tests/cases/UserTest.php
+++ b/tests/cases/UserTest.php
@@ -4,4 +4,102 @@
 use RedBeanPHP\Facade as RedBean;
 
 class UserTest extends TestCase {
+
+    public function testCreateUser() {
+        Scripts::CreateUser('newemail2@phpback.org','Bill Gates','Gates123');
+        $newuser= RedBean::load('users',4);
+        $this->assertEquals($newuser->id,'4');
+        $this->assertEquals($newuser->name,'Bill Gates');
+        $this->assertEquals($newuser->email,'newemail2@phpback.org');
+    }
+
+    public function testLoginUser() {
+        Scripts::LoginUser('newemail2@phpback.org','Gates123');
+        $this->assertEquals($this->url(),'http://localhost:8080/home/');
+        $this->assertContains('Logged as Bill Gates',$this->byTag('body')->text());
+
+        //Test log out user
+        $this->byLinkText('Log out')->click();
+        $this->assertContains('Log in',$this->byTag('body')->text());
+        $this->assertNotContains('Logged as Bill Gates',$this->byTag('body')->text());
+    }
+
+    public function testCreateIdea() {
+        Scripts::LoginUser('newemail2@phpback.org','Gates123');
+        $this->byLinkText('Post a new idea')->click();
+        $this->fillFields(array(
+          'description' => 'The theory of relativity is strange',
+          'title' => 'Relativity Theory'
+        ));
+        $this->select($this->byName('category'))->selectOptionByValue('2');
+        $this->byName('post-idea-form')->submit();
+        $newidea = RedBean::load('ideas',1);
+        $this->assertEquals($newidea->title,'Relativity Theory');
+        $this->assertEquals($newidea->authorid,'4');
+        $this->assertEquals($newidea->votes,'0');
+        $this->assertEquals($newidea->content,'The theory of relativity is strange');
+        $this->assertEquals($newidea->comments,'0');
+        $this->assertEquals($newidea->status,'new');
+        $this->assertEquals($newidea->categoryid,'2');
+
+    }
+
+    public function testCreateComentary() {
+        Scripts::LoginUser('newemail2@phpback.org','Gates123');
+        $this->url('home/idea/1/Relativity-Theory');
+        $this->fillFields(array(
+                'content' => 'the theory of relativity is fake.'
+        ));
+        $this->byName('commentbutton')->click();
+        $newcomment = RedBean::load('comments',1);
+        $this->assertEquals($newcomment->content,'the theory of relativity is fake.');
+        $this->assertEquals($newcomment->ideaid,'1');
+        $this->assertEquals($newcomment->userid ,'4');
+    }
+    public function testFlagComment() {
+        Scripts::LoginUser('newemail2@phpback.org','Gates123');
+        $this->url('home/idea/1/Relativity-Theory');
+        $this->byLinkText('flag comment')->click();
+        $newflag = RedBean::load('flags',1);
+        $this->assertEquals($newflag->toflagid,'1');
+        $this->assertEquals($newflag->userid,'4');
+    }
+    public function testVoteIdea() {
+        Scripts::LoginUser('newemail2@phpback.org','Gates123');
+        $this->url('home/idea/1/Relativity-Theory');
+        $this->byName('Vote')->click();
+        $this->byLinkText('2 Votes')->click();
+        $newvote = RedBean::load('votes',1);
+        $voteidea = RedBean::load('ideas',1);
+        $user = RedBean::load('users',4);
+        $this->assertEquals($newvote->number,'2');
+        $this->assertEquals($newvote->userid,'4');
+        $this->assertEquals($newvote->ideaid,'1');
+        $this->assertEquals($user->votes,'48');//error
+        $this->assertEquals($voteidea->votes,'2');
+    }
+    public function testDisableVoteIdea() {
+        Scripts::LoginUser('newemail2@phpback.org','Gates123');
+        $this->url('home/profile/4');
+        $this->byLinkText('Delete votes')->click();
+        $voteidea = RedBean::load('ideas',1);
+        $this->assertEquals($voteidea->votes,'0');
+    }
+    public function testChangePass() {
+        Scripts::LoginUser('newemail2@phpback.org','Gates123');
+        $this->url('/home/profile/4');
+        $this->byLinkText('Change Password')->click();
+        $this->fillFields(array(
+            'old' => 'Gates123',
+            'new' => 'Microsoft123',
+            'rnew' => 'Microsoft123'
+        ));
+        $this->byLinkText('Change Password')->click();
+        $this->byLinkText('Log out')->click();
+        Scripts::LoginUser('newemail2@phpback.org','Microsoft123');
+        $this->assertEquals($this->url(),'http://localhost:8080/home/');
+        $this->assertContains('Logged as Bill Gates',$this->byTag('body')->text());
+    }
+
+
 }
diff --git a/tests/cases/_Scripts.php b/tests/cases/_Scripts.php
index ef9a74d1..c7edcc47 100644
--- a/tests/cases/_Scripts.php
+++ b/tests/cases/_Scripts.php
@@ -31,4 +31,28 @@ public static function CreateUser($email = 'newemail@phpback.org', $name = 'Stev
       ));
       $test->byName('registration-form')->submit();
     }
+
+    public static function LoginUser($email = 'newemail@phpback.org', $password = 'Jobs123') {
+        $test = self::$instance;
+
+        $test->url('/home/login');
+
+        $test->fillFields(array(
+            'email' => $email,
+            'password' => $password
+        ));
+        $test->byName('login-form')->submit();
+    }
+    public static function CreateCategory($name = 'Amsterdam') {
+        $test = self::$instance;
+        self::LoginAdmin();
+        $test->byLinkText('System Settings')->click();
+        $test->byLinkText('Categories')->click();
+
+        $test->fillFields(array(
+            'name' => $name,
+            'description' => 'Value Category Description'
+        ));
+        $test->byName('add-category')->click();
+    }
 }
diff --git a/vendor/autoload.php b/vendor/autoload.php
old mode 100644
new mode 100755
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
old mode 100644
new mode 100755
diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE
old mode 100644
new mode 100755
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
old mode 100644
new mode 100755
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
old mode 100644
new mode 100755
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
old mode 100644
new mode 100755
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
old mode 100644
new mode 100755
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/.formatter.yml b/vendor/desarrolla2/cache/.formatter.yml
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/.gitignore b/vendor/desarrolla2/cache/.gitignore
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/.scrutinizer.yml b/vendor/desarrolla2/cache/.scrutinizer.yml
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/.travis.yml b/vendor/desarrolla2/cache/.travis.yml
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/LICENSE b/vendor/desarrolla2/cache/LICENSE
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/README.md b/vendor/desarrolla2/cache/README.md
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/build.xml b/vendor/desarrolla2/cache/build.xml
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/composer.json b/vendor/desarrolla2/cache/composer.json
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/doc/performance.md b/vendor/desarrolla2/cache/doc/performance.md
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/phpunit.xml b/vendor/desarrolla2/cache/phpunit.xml
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/AbstractAdapter.php b/vendor/desarrolla2/cache/src/Adapter/AbstractAdapter.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/AdapterInterface.php b/vendor/desarrolla2/cache/src/Adapter/AdapterInterface.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/Apc.php b/vendor/desarrolla2/cache/src/Adapter/Apc.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/File.php b/vendor/desarrolla2/cache/src/Adapter/File.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/MemCache.php b/vendor/desarrolla2/cache/src/Adapter/MemCache.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/Memcached.php b/vendor/desarrolla2/cache/src/Adapter/Memcached.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/Memory.php b/vendor/desarrolla2/cache/src/Adapter/Memory.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/Mongo.php b/vendor/desarrolla2/cache/src/Adapter/Mongo.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/MySQL.php b/vendor/desarrolla2/cache/src/Adapter/MySQL.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/NotCache.php b/vendor/desarrolla2/cache/src/Adapter/NotCache.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Adapter/Redis.php b/vendor/desarrolla2/cache/src/Adapter/Redis.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Cache.php b/vendor/desarrolla2/cache/src/Cache.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/CacheInterface.php b/vendor/desarrolla2/cache/src/CacheInterface.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Exception/AdapterNotSetException.php b/vendor/desarrolla2/cache/src/Exception/AdapterNotSetException.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Exception/ApcCacheException.php b/vendor/desarrolla2/cache/src/Exception/ApcCacheException.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Exception/CacheException.php b/vendor/desarrolla2/cache/src/Exception/CacheException.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Exception/FileCacheException.php b/vendor/desarrolla2/cache/src/Exception/FileCacheException.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Exception/MemcacheException.php b/vendor/desarrolla2/cache/src/Exception/MemcacheException.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Exception/MemoryCacheException.php b/vendor/desarrolla2/cache/src/Exception/MemoryCacheException.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Exception/MongoCacheException.php b/vendor/desarrolla2/cache/src/Exception/MongoCacheException.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/src/Exception/MySQLCacheException.php b/vendor/desarrolla2/cache/src/Exception/MySQLCacheException.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/AbstractCacheTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/AbstractCacheTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/ApcCacheTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/ApcCacheTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/FileTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/FileTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/MemCacheTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/MemCacheTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/MemoryTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/MemoryTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/MongoTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/MongoTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/MySQLTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/MySQLTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/NotCacheTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/NotCacheTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/RedisTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Adapter/Test/RedisTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Test/CacheTest.php b/vendor/desarrolla2/cache/tests/Desarrolla2/Cache/Test/CacheTest.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/bootstrap.php b/vendor/desarrolla2/cache/tests/bootstrap.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/config.yml.dist b/vendor/desarrolla2/cache/tests/config.yml.dist
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/performance/Apc.php b/vendor/desarrolla2/cache/tests/performance/Apc.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/performance/File.php b/vendor/desarrolla2/cache/tests/performance/File.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/performance/Mongo.php b/vendor/desarrolla2/cache/tests/performance/Mongo.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/performance/NoCache.php b/vendor/desarrolla2/cache/tests/performance/NoCache.php
old mode 100644
new mode 100755
diff --git a/vendor/desarrolla2/cache/tests/performance/common.php b/vendor/desarrolla2/cache/tests/performance/common.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/CHANGELOG.mdown b/vendor/monolog/monolog/CHANGELOG.mdown
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/LICENSE b/vendor/monolog/monolog/LICENSE
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/README.mdown b/vendor/monolog/monolog/README.mdown
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/composer.json b/vendor/monolog/monolog/composer.json
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/doc/extending.md b/vendor/monolog/monolog/doc/extending.md
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/doc/sockets.md b/vendor/monolog/monolog/doc/sockets.md
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/doc/usage.md b/vendor/monolog/monolog/doc/usage.md
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/phpunit.xml.dist b/vendor/monolog/monolog/phpunit.xml.dist
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/ErrorHandler.php b/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php b/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php b/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php b/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php b/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Logger.php b/vendor/monolog/monolog/src/Monolog/Logger.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/src/Monolog/Registry.php b/vendor/monolog/monolog/src/Monolog/Registry.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/ErrorHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/ErrorHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php b/vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Functional/Handler/FirePHPHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Functional/Handler/FirePHPHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/Fixtures/.gitkeep b/vendor/monolog/monolog/tests/Monolog/Handler/Fixtures/.gitkeep
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php b/vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/LoggerTest.php b/vendor/monolog/monolog/tests/Monolog/LoggerTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php b/vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/Monolog/TestCase.php b/vendor/monolog/monolog/tests/Monolog/TestCase.php
old mode 100644
new mode 100755
diff --git a/vendor/monolog/monolog/tests/bootstrap.php b/vendor/monolog/monolog/tests/bootstrap.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/.gitignore b/vendor/psr/log/.gitignore
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/LICENSE b/vendor/psr/log/LICENSE
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/Psr/Log/AbstractLogger.php b/vendor/psr/log/Psr/Log/AbstractLogger.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/Psr/Log/InvalidArgumentException.php b/vendor/psr/log/Psr/Log/InvalidArgumentException.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/Psr/Log/LogLevel.php b/vendor/psr/log/Psr/Log/LogLevel.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/Psr/Log/LoggerAwareInterface.php b/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/Psr/Log/LoggerInterface.php b/vendor/psr/log/Psr/Log/LoggerInterface.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/Psr/Log/LoggerTrait.php b/vendor/psr/log/Psr/Log/LoggerTrait.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/Psr/Log/NullLogger.php b/vendor/psr/log/Psr/Log/NullLogger.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/README.md b/vendor/psr/log/README.md
old mode 100644
new mode 100755
diff --git a/vendor/psr/log/composer.json b/vendor/psr/log/composer.json
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/.travis.yml b/vendor/vierbergenlars/php-semver/.travis.yml
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/README.md b/vendor/vierbergenlars/php-semver/README.md
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/composer.json b/vendor/vierbergenlars/php-semver/composer.json
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/definitions b/vendor/vierbergenlars/php-semver/definitions
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/license.md b/vendor/vierbergenlars/php-semver/license.md
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/JSArray.php b/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/JSArray.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/JString.php b/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/JString.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/Object.php b/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/Object.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/RegExp.php b/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/RegExp.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/Util.php b/vendor/vierbergenlars/php-semver/src/vierbergenlars/LibJs/Util.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/src/vierbergenlars/SemVer/SemVerException.php b/vendor/vierbergenlars/php-semver/src/vierbergenlars/SemVer/SemVerException.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/src/vierbergenlars/SemVer/expression.php b/vendor/vierbergenlars/php-semver/src/vierbergenlars/SemVer/expression.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/src/vierbergenlars/SemVer/internal.php b/vendor/vierbergenlars/php-semver/src/vierbergenlars/SemVer/internal.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/src/vierbergenlars/SemVer/version.php b/vendor/vierbergenlars/php-semver/src/vierbergenlars/SemVer/version.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/tests/all_tests.php b/vendor/vierbergenlars/php-semver/tests/all_tests.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/tests/base_test.php b/vendor/vierbergenlars/php-semver/tests/base_test.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/tests/regression_test.php b/vendor/vierbergenlars/php-semver/tests/regression_test.php
old mode 100644
new mode 100755
diff --git a/vendor/vierbergenlars/php-semver/tests/semver_test.php b/vendor/vierbergenlars/php-semver/tests/semver_test.php
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/.gitignore b/vendor/visualappeal/php-auto-update/.gitignore
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/LICENSE.md b/vendor/visualappeal/php-auto-update/LICENSE.md
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/README.md b/vendor/visualappeal/php-auto-update/README.md
old mode 100644
new mode 100755
index 3472616a..1b23372d
--- a/vendor/visualappeal/php-auto-update/README.md
+++ b/vendor/visualappeal/php-auto-update/README.md
@@ -1,22 +1,18 @@
-## Install
+With this library your users can automatically update their instance of your application to the newest version. I created it as a proof of concept and don't know if it is used somewhere. So please use this library with caution because it can potentially make your users software nonfunctional if something goes wrong.
+
+## Installation
 
 * Install the library via composer [visualappeal/php-auto-update](https://packagist.org/packages/visualappeal/php-auto-update)
-* Create a update file in your client application (e.g. in a subdirectory `update`) with your update routine (see `example/client/update/index.php`)
+* Create a update file/method in your application with your update routine (see `example/client/update/index.php`)
 * Create a `update.json` or `update.ini` on your server (where the client should get the updates, see `example/server/update.json` or `example/server/update.ini`)
 
-**Important: Please notice that PHP needs write permissions to update the files on your webserver**
+**Important: Please notice that PHP needs write permissions to update the files on the webserver**
 
 ## Example
 
-### Overview
-
-1. You've created a php application and your clients should be able to update theire code without coping files via ftp.
-2. Therfore you need at least one new file in the application (we will call it `update.php` but the name doesn't matter)
-3. When the user visits `update.php` the library will check for a new version and install all new versions incrementally
-
 ### Client
 
-#### update.php
+#### update.php/some method
 
 This file will install the update. For an example see `example/client/update/index.php`
 
@@ -56,12 +52,12 @@ if ($update->newVersionAvailable()) {
 }
 ```
 
-The library supports the `desarrolla2/cache` component, you should use it! Otherwise the client will download the update ini/json file on every request.
+The library supports the `desarrolla2/cache` component and you should use it! Otherwise the client will download the update ini/json file on every request.
 
 ### Server
 
-Your server needs at least one file which will be downloaded from the client to check for updates. This can be a json or an ini file. See `example/server/` for examples. The ini section key respectively the json key is the version. This library uses semantiv versioning to compare the versions. See [semver.org](http://semver.org/) for details. The ini/json value is the absolute url to the update zip file. Since the library supports incrementall updates, the zip file only need to contain the changes since the last version. The zip files do not need to be placed on the same server, they can be uploaded to S3 or another cloud storage, too.
+Your server needs at least one file which will be downloaded from the client to check for updates. This can be a json or an ini file. See `example/server/` for examples. The ini section key respectively the json key is the version. This library uses semantic versioning to compare the versions. See [semver.org](http://semver.org/) for details. The ini/json value is the absolute url to the update zip file. Since the library supports incremental updates, the zip file only need to contain the changes since the last version. The zip files do not need to be placed on the same server, they can be uploaded to S3 or another cloud storage, too.
 
 ## Documentation
 
-For the documentation see the comments in `src/AutoUpdate.php` or the example in the `example` directory
+For the documentation see the comments in `src/AutoUpdate.php` or the example in the `example` directory.
diff --git a/vendor/visualappeal/php-auto-update/composer.json b/vendor/visualappeal/php-auto-update/composer.json
old mode 100644
new mode 100755
index 1ad71320..ee87ce04
--- a/vendor/visualappeal/php-auto-update/composer.json
+++ b/vendor/visualappeal/php-auto-update/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "visualappeal/php-auto-update",
-    "description": "Autoupdater for php",
+    "description": "Autoupdater for PHP",
     "license": "Apache-2.0",
     "authors": [
         {
@@ -10,10 +10,10 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": ">= 5.3.0",
+        "php": ">= 5.5.9",
         "vierbergenlars/php-semver": "3.0.*",
-        "desarrolla2/cache": "1.8.*",
-        "monolog/monolog": "1.12.*"
+        "desarrolla2/cache": "2.1.*",
+        "monolog/monolog": "1.18.*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.5.*"
diff --git a/vendor/visualappeal/php-auto-update/example/client/files/file1.php b/vendor/visualappeal/php-auto-update/example/client/files/file1.php
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/client/files/file2.php b/vendor/visualappeal/php-auto-update/example/client/files/file2.php
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/client/index.php b/vendor/visualappeal/php-auto-update/example/client/index.php
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/client/somefile.php b/vendor/visualappeal/php-auto-update/example/client/somefile.php
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/client/update/.gitignore b/vendor/visualappeal/php-auto-update/example/client/update/.gitignore
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/client/update/index.php b/vendor/visualappeal/php-auto-update/example/client/update/index.php
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/server/0.1.0.zip b/vendor/visualappeal/php-auto-update/example/server/0.1.0.zip
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/server/0.2.0.zip b/vendor/visualappeal/php-auto-update/example/server/0.2.0.zip
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/server/0.2.1.zip b/vendor/visualappeal/php-auto-update/example/server/0.2.1.zip
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/server/update.ini b/vendor/visualappeal/php-auto-update/example/server/update.ini
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/example/server/update.json b/vendor/visualappeal/php-auto-update/example/server/update.json
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/src/AutoUpdate.php b/vendor/visualappeal/php-auto-update/src/AutoUpdate.php
old mode 100644
new mode 100755
index 1635873f..ab4b4e1c
--- a/vendor/visualappeal/php-auto-update/src/AutoUpdate.php
+++ b/vendor/visualappeal/php-auto-update/src/AutoUpdate.php
@@ -15,778 +15,891 @@
  */
 class AutoUpdate
 {
-	/**
-	 * The latest version.
-	 *
-	 * @var vierbergenlars\SemVer\version
-	 */
-	private $_latestVersion = null;
-
-	/**
-	 * Updates not yet installed.
-	 *
-	 * @var array
-	 */
-	private $_updates = null;
-
-	/**
-	 * Cache for update requests.
-	 *
-	 * @var Desarrolla2\Cache\Cache
-	 */
-	private $_cache = null;
-
-	/**
-	 * Result of simulated install.
-	 *
-	 * @var array
-	 */
-	private $_simulationResults = array();
-
-	/**
-	 * Temporary download directory.
-	 *
-	 * @var string
-	 */
-	private $_tempDir = '';
-
-	/**
-	 * Install directory.
-	 *
-	 * @var string
-	 */
-	private $_installDir = '';
-
-	/**
-	 * Update branch.
-	 *
-	 * @var string
-	 */
-	private $_branch = '';
-
-	/**
-	 * Url to the update folder on the server.
-	 *
-	 * @var string
-	 */
-	protected $_updateUrl = 'https://example.com/updates/';
-
-	/**
-	 * Version filename on the server.
-	 *
-	 * @var string
-	 */
-	protected $_updateFile = 'update.json';
-
-	/**
-	 * Current version.
-	 *
-	 * @var vierbergenlars\SemVer\version
-	 */
-	protected $_currentVersion = null;
-
-	/**
-	 * Create new folders with this privileges.
-	 *
-	 * @var int
-	 */
-	public $dirPermissions = 0755;
-
-	/**
-	 * Update script filename.
-	 *
-	 * @var string
-	 */
-	public $updateScriptName = '_upgrade.php';
-
-	/**
-	 * No update available.
-	 */
-	const NO_UPDATE_AVAILABLE = 0;
-
-	/**
-	 * Zip file could not be opened.
-	 */
-	const ERROR_INVALID_ZIP = 10;
-
-	/**
-	 * Could not check for last version.
-	 */
-	const ERROR_VERSION_CHECK = 20;
-
-	/**
-	 * Temp directory does not exist or is not writable.
-	 */
-	const ERROR_TEMP_DIR = 30;
-
-	/**
-	 * Install directory does not exist or is not writable.
-	 */
-	const ERROR_INSTALL_DIR = 35;
-
-	/**
-	 * Could not download update.
-	 */
-	const ERROR_DOWNLOAD_UPDATE = 40;
-
-	/**
-	 * Could not delete zip update file.
-	 */
-	const ERROR_DELETE_TEMP_UPDATE = 50;
-
-	/**
-	 * Error while installing the update.
-	 */
-	const ERROR_INSTALL = 60;
-
-	/**
-	 * Error in simulated install.
-	 */
-	const ERROR_SIMULATE = 70;
-
-	/**
-	 * Create new instance
-	 *
-	 * @param string $tempDir
-	 * @param string $installDir
-	 * @param int $maxExecutionTime
-	 */
-	public function __construct($tempDir = null, $installDir = null, $maxExecutionTime = 60) {
-		$this->setTempDir(($tempDir !== null) ? $tempDir : __DIR__ . '/temp/');
-		$this->setInstallDir(($installDir !== null) ? $installDir : __DIR__ . '/../../');
-
-		$this->_latestVersion = new version('0.0.0');
-		$this->_currentVersion = new version('0.0.0');
-
-		// Init cache
-		$this->_cache = new Cache(new NotCache());
-
-		// Init logger
-		$this->_log = new Logger('auto-update');
-		$this->_log->pushHandler(new NullHandler());
-
-		ini_set('max_execution_time', $maxExecutionTime);
-	}
-
-	/**
-	 * Set the temporary download directory.
-	 *
-	 * @param string $dir
-	 */
-	public function setTempDir($dir)
-	{
-		// Add slash at the end of the path
-		if (substr($dir, -1 != '/'))
-			$dir = $dir . '/';
-
-		if (!is_dir($dir)) {
-			if (!mkdir($dir, 0755, true)) {
-				$this->_log->addCritical(sprintf('Could not create temporary directory "%s"', $dir));
-				return;
-			}
-		}
-
-		$this->_tempDir = $dir;
-		return $this;
-	}
-
-	/**
-	 * Set the install directory.
-	 *
-	 * @param string $dir
-	 */
-	public function setInstallDir($dir)
-	{
-		// Add slash at the end of the path
-		if (substr($dir, -1 != '/'))
-			$dir = $dir . '/';
-
-		if (!is_dir($dir)) {
-			if (!mkdir($dir, 0755, true)) {
-				$this->_log->addCritical(sprintf('Could not create temporary directory "%s"', $dir));
-				return;
-			}
-		}
-
-		$this->_installDir = $dir;
-		return $this;
-	}
-
-	/**
-	 * Set the update filename.
-	 *
-	 * @param string $updateFile
-	 */
-	public function setUpdateFile($updateFile)
-	{
-		$this->_updateFile = $updateFile;
-		return $this;
-	}
+    /**
+     * The latest version.
+     *
+     * @var vierbergenlars\SemVer\version
+     */
+    private $_latestVersion = null;
+
+    /**
+     * Updates not yet installed.
+     *
+     * @var array
+     */
+    private $_updates = null;
+
+    /**
+     * Cache for update requests.
+     *
+     * @var Desarrolla2\Cache\Cache
+     */
+    private $_cache = null;
+
+    /**
+     * Result of simulated install.
+     *
+     * @var array
+     */
+    private $_simulationResults = array();
+
+    /**
+     * Temporary download directory.
+     *
+     * @var string
+     */
+    private $_tempDir = '';
+
+    /**
+     * Install directory.
+     *
+     * @var string
+     */
+    private $_installDir = '';
+
+    /**
+     * Update branch.
+     *
+     * @var string
+     */
+    private $_branch = '';
+
+    /**
+     * Url to the update folder on the server.
+     *
+     * @var string
+     */
+    protected $_updateUrl = 'https://example.com/updates/';
+
+    /**
+     * Version filename on the server.
+     *
+     * @var string
+     */
+    protected $_updateFile = 'update.json';
+
+    /**
+     * Current version.
+     *
+     * @var vierbergenlars\SemVer\version
+     */
+    protected $_currentVersion = null;
+
+    /**
+     * Create new folders with this privileges.
+     *
+     * @var int
+     */
+    public $dirPermissions = 0755;
+
+    /**
+     * Update script filename.
+     *
+     * @var string
+     */
+    public $updateScriptName = '_upgrade.php';
+
+    /**
+     * Username authentication
+     *
+     * @var string
+     */
+    private $_username = '';
+
+    /**
+     * Password authentication
+     *
+     * @var string
+     */
+    private $_password = '';
+
+    /**
+     * No update available.
+     */
+    const NO_UPDATE_AVAILABLE = 0;
+
+    /**
+     * Zip file could not be opened.
+     */
+    const ERROR_INVALID_ZIP = 10;
+
+    /**
+     * Could not check for last version.
+     */
+    const ERROR_VERSION_CHECK = 20;
+
+    /**
+     * Temp directory does not exist or is not writable.
+     */
+    const ERROR_TEMP_DIR = 30;
+
+    /**
+     * Install directory does not exist or is not writable.
+     */
+    const ERROR_INSTALL_DIR = 35;
+
+    /**
+     * Could not download update.
+     */
+    const ERROR_DOWNLOAD_UPDATE = 40;
+
+    /**
+     * Could not delete zip update file.
+     */
+    const ERROR_DELETE_TEMP_UPDATE = 50;
+
+    /**
+     * Error while installing the update.
+     */
+    const ERROR_INSTALL = 60;
+
+    /**
+     * Error in simulated install.
+     */
+    const ERROR_SIMULATE = 70;
+
+    /**
+     * Create new instance
+     *
+     * @param string $tempDir
+     * @param string $installDir
+     * @param int    $maxExecutionTime
+     */
+    public function __construct($tempDir = null, $installDir = null, $maxExecutionTime = 60)
+    {
+        // Init logger
+        $this->_log = new Logger('auto-update');
+        $this->_log->pushHandler(new NullHandler());
+
+        $this->setTempDir(($tempDir !== null) ? $tempDir : __DIR__ . DIRECTORY_SEPARATOR . 'temp' . DIRECTORY_SEPARATOR);
+        $this->setInstallDir(($installDir !== null) ? $installDir : __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+
+        $this->_latestVersion = new version('0.0.0');
+        $this->_currentVersion = new version('0.0.0');
+
+        // Init cache
+        $this->_cache = new Cache(new NotCache());
+
+        ini_set('max_execution_time', $maxExecutionTime);
+    }
+
+    /**
+     * Set the temporary download directory.
+     *
+     * @param string $dir
+     * @return $this|void
+     */
+    public function setTempDir($dir)
+    {
+        $dir = $this->addTrailingSlash($dir);
+
+        if (!is_dir($dir)) {
+            $this->log(sprintf('Creating new temporary directory "%s"', $dir));
+
+            if (!mkdir($dir, 0755, true)) {
+                $this->log(sprintf('Could not create temporary directory "%s"', $dir));
+
+                return;
+            }
+        }
+
+        $this->_tempDir = $dir;
+
+        return $this;
+    }
+
+    /**
+     * Set the install directory.
+     *
+     * @param string $dir
+     * @return $this|void
+     */
+    public function setInstallDir($dir)
+    {
+        $dir = $this->addTrailingSlash($dir);
+
+        if (!is_dir($dir)) {
+            $this->log(sprintf('Creating new install directory "%s"', $dir));
+
+            if (!mkdir($dir, 0755, true)) {
+                $this->log(sprintf('Could not create install directory "%s"', $dir));
+
+                return;
+            }
+        }
+
+        $this->_installDir = $dir;
+
+        return $this;
+    }
+
+    /**
+     * Set the update filename.
+     *
+     * @param string $updateFile
+     * @return $this
+     */
+    public function setUpdateFile($updateFile)
+    {
+        $this->_updateFile = $updateFile;
+
+        return $this;
+    }
+
+    /**
+     * Set the update filename.
+     *
+     * @param string $updateUrl
+     * @return $this
+     */
+    public function setUpdateUrl($updateUrl)
+    {
+        $this->_updateUrl = $updateUrl;
+
+        return $this;
+    }
+
+    /**
+     * Set the update branch.
+     *
+     * @param string branch
+     * @return $this
+     */
+    public function setBranch($branch)
+    {
+        $this->_branch = $branch;
+
+        return $this;
+    }
+
+    /**
+     * Set the cache component.
+     *
+     * @param Desarrolla2\Cache\Adapter\AdapterInterface $adapter See https://github.com/desarrolla2/Cache
+     * @param int $ttl Time to live in seconds
+     * @return $this
+     */
+    public function setCache($adapter, $ttl = 3600)
+    {
+        $adapter->setOption('ttl', $ttl);
+        $this->_cache = new Cache($adapter);
+
+        return $this;
+    }
+
+    /**
+     * Set the version of the current installed software.
+     *
+     * @param string $currentVersion
+     *
+     * @return bool
+     */
+    public function setCurrentVersion($currentVersion)
+    {
+        $version = new version($currentVersion);
+        if ($version->valid() === null) {
+            $this->log(sprintf('Invalid current version "%s"', $currentVersion));
+
+            return false;
+        }
+
+        $this->_currentVersion = $version;
+
+        return $this;
+    }
+
+    /**
+     * Set authentication
+     * @param $username
+     * @param $password
+     */
+    public function setBasicAuth($username, $password)
+    {
+        $this->_username = $username;
+        $this->_password = $password;
+    }
+
+    /**
+     * Set authentication in update method of users and password exist
+     * @return null|resource
+     */
+    private function _useBasicAuth()
+    {
+        if ($this->_username && $this->_password) {
+            return stream_context_create(array(
+                'http' => array(
+                    'header' => "Authorization: Basic " . base64_encode("$this->_username:$this->_password")
+                )
+            ));
+        }
+
+        return null;
+    }
+
+    /**
+     * Add a new logging handler.
+     *
+     * @param \Monolog\Handler\HandlerInterface|Monolog\Handler\HandlerInterface $handler See https://github.com/Seldaek/monolog
+     * @return $this
+     */
+    public function addLogHandler(\Monolog\Handler\HandlerInterface $handler)
+    {
+        $this->_log->pushHandler($handler);
+
+        return $this;
+    }
+
+    /**
+     * Get the name of the latest version.
+     *
+     * @return vierbergenlars\SemVer\version
+     */
+    public function getLatestVersion()
+    {
+        return $this->_latestVersion;
+    }
+
+    /**
+     * Get an array of versions which will be installed.
+     *
+     * @return array
+     */
+    public function getVersionsToUpdate()
+    {
+        return array_map(function ($update) {
+            return $update['version'];
+        }, $this->_updates);
+    }
+
+    /**
+     * Get the results of the last simulation.
+     *
+     * @return array
+     */
+    public function getSimulationResults()
+    {
+        return $this->_simulationResults;
+    }
+
+    /**
+     * Remove directory recursively.
+     *
+     * @param string $dir
+     *
+     * @return void
+     */
+    private function _removeDir($dir)
+    {
+        $this->log(sprintf('Remove directory "%s"', $dir));
+
+        if (!is_dir($dir)) {
+            $this->_log->addWarning(sprintf('"%s" is not a directory!', $dir));
+
+            return false;
+        }
+
+        $objects = array_diff(scandir($dir), array('.', '..'));
+        foreach ($objects as $object) {
+            if (is_dir($dir . DIRECTORY_SEPARATOR . $object))
+                $this->_removeDir($dir . DIRECTORY_SEPARATOR . $object);
+            else
+                unlink($dir . DIRECTORY_SEPARATOR . $object);
+        }
+
+        return rmdir($dir);
+    }
+
+    /**
+     * Check for a new version
+     *
+     * @return int|bool
+     *         true: New version is available
+     *         false: Error while checking for update
+     *         int: Status code (i.e. AutoUpdate::NO_UPDATE_AVAILABLE)
+     */
+    public function checkUpdate()
+    {
+        $this->_log->addNotice('Checking for a new update...');
+
+        // Reset previous updates
+        $this->_latestVersion = new version('0.0.0');
+        $this->_updates = [];
+
+        $versions = $this->_cache->get('update-versions');
+
+        // Check if cache is empty
+        if ($versions === false) {
+            // Create absolute url to update file
+            $updateFile = $this->_updateUrl . DIRECTORY_SEPARATOR . $this->_updateFile;
+            if (!empty($this->_branch))
+                $updateFile .= '.' . $this->_branch;
+
+            $this->log(sprintf('Get new updates from %s', $updateFile));
+
+            // Read update file from update server
+            $update = @file_get_contents($updateFile, $this->_useBasicAuth());
+            if ($update === false) {
+                $this->log(sprintf('Could not download update file "%s"!', $updateFile));
+
+                return false;
+            }
+
+            // Parse update file
+            $updateFileExtension = substr(strrchr($this->_updateFile, '.'), 1);
+            switch ($updateFileExtension) {
+                case 'ini':
+                    $versions = @parse_ini_string($update, true);
+                    if (!is_array($versions)) {
+                        $this->log('Unable to parse ini update file!');
+
+                        return false;
+                    }
+
+                    $versions = array_map(function ($block) {
+                        return isset($block['url']) ? $block['url'] : false;
+                    }, $versions);
+
+                    break;
+                case 'json':
+                    $versions = (array)@json_decode($update);
+                    if (!is_array($versions)) {
+                        $this->log('Unable to parse json update file!');
+
+                        return false;
+                    }
+
+                    break;
+                default:
+                    $this->log(sprintf('Unknown file extension "%s"', $updateFileExtension));
+
+                    return false;
+            }
+
+            $this->_cache->set('update-versions', $versions);
+        } else {
+            $this->log('Got updates from cache');
+        }
+
+        // Check for latest version
+        foreach ($versions as $versionRaw => $updateUrl) {
+            $version = new version($versionRaw);
+            if ($version->valid() === null) {
+                $this->log(sprintf('Could not parse version "%s" from update server "%s"', $versionRaw, $updateFile));
+                continue;
+            }
+
+            if (version::gt($version, $this->_currentVersion)) {
+                if (version::gt($version, $this->_latestVersion))
+                    $this->_latestVersion = $version;
+
+                $this->_updates[] = [
+                    'version' => $version,
+                    'url'     => $updateUrl,
+                ];
+            }
+        }
+
+        // Sort versions to install
+        usort($this->_updates, function ($a, $b) {
+            return version::compare($a['version'], $b['version']);
+        });
+
+        if ($this->newVersionAvailable()) {
+            $this->log(sprintf('New version "%s" available', $this->_latestVersion));
+
+            return true;
+        } else {
+            $this->log('No new version available');
+
+            return self::NO_UPDATE_AVAILABLE;
+        }
+    }
+
+    /**
+     * Check if a new version is available.
+     *
+     * @return bool
+     */
+    public function newVersionAvailable()
+    {
+        return version::gt($this->_latestVersion, $this->_currentVersion);
+    }
+
+    /**
+     * Download the update
+     *
+     * @param string $updateUrl Url where to download from
+     * @param string $updateFile Path where to save the download
+     *
+     * @return bool
+     */
+    protected function _downloadUpdate($updateUrl, $updateFile)
+    {
+        $this->log(sprintf('Downloading update "%s" to "%s"', $updateUrl, $updateFile));
+        $update = @file_get_contents($updateUrl, $this->_useBasicAuth());
+
+        if ($update === false) {
+            $this->log(sprintf('Could not download update "%s"!', $updateUrl));
+
+            return false;
+        }
+
+        $handle = fopen($updateFile, 'w');
+
+        if (!$handle) {
+            $this->log(sprintf('Could not open file handle to save update to "%s"!', $updateFile));
+
+            return false;
+        }
+
+        if (!fwrite($handle, $update)) {
+            $this->log(sprintf('Could not write update to file "%s"!', $updateFile));
+            fclose($handle);
+
+            return false;
+        }
+
+        fclose($handle);
+
+        return true;
+    }
+
+    /**
+     * Simulate update process.
+     *
+     * @param string $updateFile
+     *
+     * @return bool
+     */
+    protected function _simulateInstall($updateFile)
+    {
+        $this->_log->addNotice('[SIMULATE] Install new version');
+        clearstatcache();
+
+        // Check if zip file could be opened
+        $zip = zip_open($updateFile);
+        if (!is_resource($zip)) {
+            $this->log(sprintf('Could not open zip file "%s", error: %d', $updateFile, $zip));
+
+            return false;
+        }
+
+        $i = -1;
+        $files = [];
+        $simulateSuccess = true;
+
+        while ($file = zip_read($zip)) {
+            $i++;
+
+            $filename = zip_entry_name($file);
+            $foldername = $this->_installDir . dirname($filename);
+            $absoluteFilename = $this->_installDir . $filename;
+
+            $files[$i] = [
+                'filename'          => $filename,
+                'foldername'        => $foldername,
+                'absolute_filename' => $absoluteFilename,
+            ];
+
+            $this->log(sprintf('[SIMULATE] Updating file "%s"', $filename));
+
+            // Check if parent directory is writable
+            if (!is_dir($foldername)) {
+                $this->log(sprintf('[SIMULATE] Create directory "%s"', $foldername));
+                $files[$i]['parent_folder_exists'] = false;
+
+                $parent = dirname($foldername);
+                if (!is_writable($parent)) {
+                    $files[$i]['parent_folder_writable'] = false;
+
+                    $simulateSuccess = false;
+                    $this->_log->addWarning(sprintf('[SIMULATE] Directory "%s" has to be writeable!', $parent));
+                } else {
+                    $files[$i]['parent_folder_writable'] = true;
+                }
+            }
+
+            // Skip if entry is a directory
+            if (substr($filename, -1, 1) == DIRECTORY_SEPARATOR)
+                continue;
+
+            // Read file contents from archive
+            $contents = zip_entry_read($file, zip_entry_filesize($file));
+            if ($contents === false) {
+                $files[$i]['extractable'] = false;
+
+                $simulateSuccess = false;
+                $this->_log->addWarning(sprintf('[SIMULATE] Coud not read contents of file "%s" from zip file!', $filename));
+            }
+
+            // Write to file
+            if (file_exists($absoluteFilename)) {
+                $files[$i]['file_exists'] = true;
+                if (!is_writable($absoluteFilename)) {
+                    $files[$i]['file_writable'] = false;
+
+                    $simulateSuccess = false;
+                    $this->_log->addWarning('[SIMULATE] Could not overwrite "%s"!', $absoluteFilename);
+                }
+            } else {
+                $files[$i]['file_exists'] = false;
+
+                if (is_dir($foldername)) {
+                    if (!is_writable($foldername)) {
+                        $files[$i]['file_writable'] = false;
+
+                        $simulateSuccess = false;
+                        $this->_log->addWarning(sprintf('[SIMULATE] The file "%s" could not be created!', $absoluteFilename));
+                    } else {
+                        $files[$i]['file_writable'] = true;
+                    }
+                } else {
+                    $files[$i]['file_writable'] = true;
+
+                    $this->log(sprintf('[SIMULATE] The file "%s" could be created', $absoluteFilename));
+                }
+            }
+
+            if ($filename == $this->updateScriptName) {
+                $this->log(sprintf('[SIMULATE] Update script "%s" found', $absoluteFilename));
+                $files[$i]['update_script'] = true;
+            } else {
+                $files[$i]['update_script'] = false;
+            }
+        }
+
+        $this->_simulationResults = $files;
+
+        return $simulateSuccess;
+    }
+
+    /**
+     * Install update.
+     *
+     * @param string $updateFile Path to the update file
+     * @param bool   $simulateInstall Check for directory and file permissions before copying files
+     *
+     * @return bool
+     */
+    protected function _install($updateFile, $simulateInstall, $version)
+    {
+        $this->_log->addNotice(sprintf('Trying to install update "%s"', $updateFile));
+
+        // Check if install should be simulated
+        if ($simulateInstall && !$this->_simulateInstall($updateFile)) {
+            $this->log('Simulation of update process failed!');
+
+            return self::ERROR_SIMULATE;
+        }
+
+        clearstatcache();
+
+        // Check if zip file could be opened
+        $zip = zip_open($updateFile);
+        if (!is_resource($zip)) {
+            $this->log(sprintf('Could not open zip file "%s", error: %d', $updateFile, $zip));
+
+            return false;
+        }
+
+        // Read every file from archive
+        while ($file = zip_read($zip)) {
+            $filename = zip_entry_name($file);
+            $foldername = $this->_installDir . dirname($filename);
+            $absoluteFilename = $this->_installDir . $filename;
+
+            $this->log(sprintf('Updating file "%s"', $filename));
+
+            if (!is_dir($foldername)) {
+                if (!mkdir($foldername, $this->dirPermissions, true)) {
+                    $this->log(sprintf('Directory "%s" has to be writeable!', $parent));
+
+                    return false;
+                }
+            }
+
+            // Skip if entry is a directory
+            if (substr($filename, -1, 1) == DIRECTORY_SEPARATOR)
+                continue;
+
+            // Read file contents from archive
+            $contents = zip_entry_read($file, zip_entry_filesize($file));
+
+            if ($contents === false) {
+                $this->log(sprintf('Coud not read zip entry "%s"', $file));
+                continue;
+            }
+
+            // Write to file
+            if (file_exists($absoluteFilename)) {
+                if (!is_writable($absoluteFilename)) {
+                    $this->log('Could not overwrite "%s"!', $absoluteFilename);
+
+                    zip_close($zip);
+
+                    return false;
+                }
+            } else {
+                if (!touch($absoluteFilename)) {
+                    $this->log(sprintf('[SIMULATE] The file "%s" could not be created!', $absoluteFilename));
+                    zip_close($zip);
 
-	/**
-	 * Set the update filename.
-	 *
-	 * @param string $updateUrl
-	 */
-	public function setUpdateUrl($updateUrl)
-	{
-		$this->_updateUrl = $updateUrl;
-		return $this;
-	}
+                    return false;
+                }
+
+                $this->log(sprintf('File "%s" created', $absoluteFilename));
+            }
+
+            $updateHandle = @fopen($absoluteFilename, 'w');
 
-	/**
-	 * Set the update branch.
-	 *
-	 * @param string branch
-	 */
-	public function setBranch($branch)
-	{
-		$this->_branch = $branch;
-		return $this;
-	}
+            if (!$updateHandle) {
+                $this->log(sprintf('Could not open file "%s"!', $absoluteFilename));
+                zip_close($zip);
 
-	/**
-	 * Set the cache component.
-	 *
-	 * @param Desarrolla2\Cache\Adapter\AdapterInterface $adapter See https://github.com/desarrolla2/Cache
-	 * @param int $ttl Time to live in seconds
-	 */
-	public function setCache($adapter, $ttl = 3600)
-	{
-		$adapter->setOption('ttl', $ttl);
-		$this->_cache = new Cache($adapter);
-		return $this;
-	}
+                return false;
+            }
 
-	/**
-	 * Set the version of the current installed software.
-	 *
-	 * @param string $currentVersion
-	 *
-	 * @return bool
-	 */
-	public function setCurrentVersion($currentVersion)
-	{
-		$version = new version($currentVersion);
-		if ($version->valid() === null) {
-			$this->_log->addError(sprintf('Invalid current version "%s"', $currentVersion));
-			return false;
-		}
+            if (!fwrite($updateHandle, $contents)) {
+                $this->log(sprintf('Could not write to file "%s"!', $absoluteFilename));
+                zip_close($zip);
 
-		$this->_currentVersion = $version;
-		return $this;
-	}
+                return false;
+            }
 
-	/**
-	 * Add a new logging handler.
-	 *
-	 * @param Monolog\Handler\HandlerInterface $handler See https://github.com/Seldaek/monolog
-	 */
-	public function addLogHandler(\Monolog\Handler\HandlerInterface $handler)
-	{
-		$this->_log->pushHandler($handler);
-		return $this;
-	}
+            fclose($updateHandle);
 
-	/**
-	 * Get the name of the latest version.
-	 *
-	 * @return vierbergenlars\SemVer\version
-	 */
-	public function getLatestVersion()
-	{
-		return $this->_latestVersion;
-	}
+            //If file is a update script, include
+            if ($filename == $this->updateScriptName) {
+                $this->log(sprintf('Try to include update script "%s"', $absoluteFilename));
+                require($absoluteFilename);
 
-	/**
-	 * Get an array of versions which will be installed.
-	 *
-	 * @return array
-	 */
-	public function getVersionsToUpdate()
-	{
-		return array_map(function($update) {
-			return $update['version'];
-		}, $this->_updates);
-	}
+                $this->log(sprintf('Update script "%s" included!', $absoluteFilename));
+                if (!unlink($absoluteFilename)) {
+                    $this->_log->addWarning(sprintf('Could not delete update script "%s"!', $absoluteFilename));
+                }
+            }
+        }
 
-	/**
-	 * Get the results of the last simulation.
-	 *
-	 * @return array
-	 */
-	public function getSimulationResults()
-	{
-		return $this->_simulationResults;
-	}
+        zip_close($zip);
 
-	/**
-	 * Remove directory recursively.
-	 *
-	 * @param string $dir
-	 *
-	 * @return void
-	 */
-	private function _removeDir($dir) {
-		$this->_log->addDebug(sprintf('Remove directory "%s"', $dir));
-
-		if (!is_dir($dir)) {
-			$this->_log->addWarning(sprintf('"%s" is not a directory!', $dir));
-			return false;
-		}
+        // TODO
+        $this->_log->addNotice(sprintf('Update "%s" successfully installed', $version));
 
-		$objects = array_diff(scandir($dir), array('.', '..'));
-		foreach ($objects as $object) {
-			if (is_dir($dir . '/' . $object))
-				$this->_removeDir($dir . '/' . $object);
-			else
-				unlink($dir . '/' . $object);
-		}
+        return true;
+    }
 
-		return rmdir($dir);
+	public function log($text) {
+		$this->logList[] = $text;
 	}
 
-	/**
-	 * Check for a new version
-	 *
-	 * @return int|bool
-	 *         true: New version is available
-	 *         false: Error while checking for update
-	 *         int: Status code (i.e. AutoUpdate::NO_UPDATE_AVAILABLE)
-	 */
-	public function checkUpdate() {
-		$this->_log->addNotice('Checking for a new update...');
-
-		// Reset previous updates
-		$this->_latestVersion = new version('0.0.0');
-		$this->_updates = [];
-
-		$versions = $this->_cache->get('update-versions');
-
-		// Check if cache is empty
-		if ($versions === false) {
-			// Create absolute url to update file
-			$updateFile = $this->_updateUrl . '/' . $this->_updateFile;
-			if (!empty($this->_branch))
-				$updateFile .= '.' . $this->_branch;
-
-			$this->_log->addDebug(sprintf('Get new updates from %s', $updateFile));
-
-			// Read update file from update server
-			$update = @file_get_contents($updateFile);
-			if ($update === false) {
-				$this->_log->addInfo(sprintf('Could not download update file "%s"!', $updateFile));
-				return false;
-			}
-
-			// Parse update file
-			$updateFileExtension = substr(strrchr($this->_updateFile, '.'), 1);
-			switch ($updateFileExtension) {
-				case 'ini':
-					$versions = @parse_ini_string($update, true);
-					if (!is_array($versions)) {
-						$this->_log->addInfo('Unable to parse ini update file!');
-						return false;
-					}
-
-					$versions = array_map(function($block) {
-						return isset($block['url']) ? $block['url'] : false;
-					}, $versions);
-
-					break;
-				case 'json':
-					$versions = (array) @json_decode($update);
-					if (!is_array($versions)) {
-						$this->_log->addInfo('Unable to parse json update file!');
-						return false;
-					}
-
-					break;
-				default:
-					$this->_log->addInfo(sprintf('Unknown file extension "%s"', $updateFileExtension));
-					return false;
-			}
-
-			$this->_cache->set('update-versions', $versions);
-		} else {
-			$this->_log->addDebug('Got updates from cache');
-		}
-
-		// Check for latest version
-		foreach ($versions as $versionRaw => $updateUrl) {
-			$version = new version($versionRaw);
-			if ($version->valid() === null) {
-				$this->_log->addInfo(sprintf('Could not parse version "%s" from update server "%s"', $versionRaw, $updateFile));
-				continue;
-			}
-
-			if (version::gt($version, $this->_currentVersion)) {
-				if (version::gt($version, $this->_latestVersion))
-					$this->_latestVersion = $version;
-
-				$this->_updates[] = [
-					'version' => $version,
-					'url' => $updateUrl,
-				];
-			}
+	public function printLogs () {
+		foreach ($this->logList as $log) {
+			echo $log . '<br />';
 		}
-
-		// Sort versions to install
-		usort($this->_updates, function($a, $b) {
-			return version::compare($a['version'], $b['version']);
-		});
-
-		if ($this->newVersionAvailable()) {
-			$this->_log->addDebug(sprintf('New version "%s" available', $this->_latestVersion));
-			return true;
-		} else {
-			$this->_log->addDebug('No new version available');
-			return self::NO_UPDATE_AVAILABLE;
-		}
-	}
-
-	/**
-	 * Check if a new version is available.
-	 *
-	 * @return bool
-	 */
-	public function newVersionAvailable()
-	{
-		return version::gt($this->_latestVersion, $this->_currentVersion);
 	}
 
-	/**
-	 * Download the update
-	 *
-	 * @param string $updateUrl Url where to download from
-	 * @param string $updateFile Path where to save the download
-	 *
-	 * @return bool
-	 */
-	protected function _downloadUpdate($updateUrl, $updateFile) {
-		$this->_log->addInfo(sprintf('Downloading update "%s" to "%s"', $updateUrl, $updateFile));
-		$update = @file_get_contents($updateUrl);
-
-		if ($update === false) {
-			$this->_log->addError(sprintf('Could not download update "%s"!', $updateUrl));
-			return false;
-		}
-
-		$handle = fopen($updateFile, 'w');
-
-		if (!$handle) {
-			$this->_log->addError(sprintf('Could not open file handle to save update to "%s"!', $updateFile));
-			return false;
-		}
-
-		if (!fwrite($handle, $update)) {
-			$this->_log->addError(sprintf('Could not write update to file "%s"!', $updateFile));
-			fclose($handle);
-			return false;
-		}
-
-		fclose($handle);
-
-		return true;
-	}
-
-	/**
-	 * Simulate update process.
-	 *
-	 * @param string $updateFile
-	 *
-	 * @return bool
-	 */
-	protected function _simulateInstall($updateFile)
-	{
-		$this->_log->addNotice('[SIMULATE] Install new version');
-		clearstatcache();
-
-		// Check if zip file could be opened
-		$zip = zip_open($updateFile);
-		if (!is_resource($zip)) {
-			$this->_log->addError(sprintf('Could not open zip file "%s", error: %d', $updateFile, $zip));
-			return false;
-		}
-
-		$i = -1;
-		$files = [];
-		$simulateSuccess = true;
-
-		while ($file = zip_read($zip)) {
-			$i++;
-
-			$filename = zip_entry_name($file);
-			$foldername = $this->_installDir . dirname($filename);
-			$absoluteFilename = $this->_installDir . $filename;
-
-			$files[$i] = [
-				'filename' => $filename,
-				'foldername' => $foldername,
-				'absolute_filename' => $absoluteFilename,
-			];
-
-			$this->_log->addDebug(sprintf('[SIMULATE] Updating file "%s"', $filename));
-
-			// Check if parent directory is writable
-			if (!is_dir($foldername)) {
-				$this->_log->addDebug(sprintf('[SIMULATE] Create directory "%s"', $foldername));
-				$files[$i]['parent_folder_exists'] = false;
-
-				$parent = dirname($foldername);
-				if (!is_writable($parent)) {
-					$files[$i]['parent_folder_writable'] = false;
-
-					$simulateSuccess = false;
-					$this->_log->addWarning(sprintf('[SIMULATE] Directory "%s" has to be writeable!', $parent));
-				} else {
-					$files[$i]['parent_folder_writable'] = true;
-				}
-			}
-
-			// Skip if entry is a directory
-			if (substr($filename, -1, 1) == '/')
-				continue;
-
-			// Read file contents from archive
-			$contents = zip_entry_read($file, zip_entry_filesize($file));
-			if ($contents === false) {
-				$files[$i]['extractable'] = false;
-
-				$simulateSuccess = false;
-				$this->_log->addWarning(sprintf('[SIMULATE] Coud not read contents of file "%s" from zip file!', $filename));
-			}
-
-			// Write to file
-			if (file_exists($absoluteFilename)) {
-				$files[$i]['file_exists'] = true;
-				if (!is_writable($absoluteFilename)) {
-					$files[$i]['file_writable'] = false;
-
-					$simulateSuccess = false;
-					$this->_log->addWarning('[SIMULATE] Could not overwrite "%s"!', $absoluteFilename);
-				}
-			} else {
-				$files[$i]['file_exists'] = false;
-
-				if (is_dir($foldername)) {
-					if (!is_writable($foldername)) {
-						$files[$i]['file_writable'] = false;
-
-						$simulateSuccess = false;
-						$this->_log->addWarning(sprintf('[SIMULATE] The file "%s" could not be created!', $absoluteFilename));
-					} else {
-						$files[$i]['file_writable'] = true;
-					}
-				} else {
-					$files[$i]['file_writable'] = true;
-
-					$this->_log->addDebug(sprintf('[SIMULATE] The file "%s" could be created', $absoluteFilename));
-				}
-			}
-
-			if ($filename == $this->updateScriptName) {
-				$this->_log->addDebug('[SIMULATE] Update script "%s" found', $absoluteFilename);
-				$files[$i]['update_script'] = true;
-			} else {
-				$files[$i]['update_script'] = false;
-			}
-		}
-
-		$this->_simulationResults = $files;
-		return $simulateSuccess;
-	}
-
-	/**
-	 * Install update.
-	 *
-	 * @param string $updateFile Path to the update file
-	 * @param bool $simulateInstall Check for directory and file permissions before copying files
-	 *
-	 * @return bool
-	 */
-	protected function _install($updateFile, $simulateInstall, $version) {
-		$this->_log->addNotice(sprintf('Trying to install update "%s"', $updateFile));
-
-		// Check if install should be simulated
-		if ($simulateInstall && !$this->_simulateInstall($updateFile)) {
-			$this->_log->addCritical('Simulation of update process failed!');
-			zip_close($zip);
-			return self::ERROR_SIMULATE;
-		}
-
-		clearstatcache();
-
-		// Check if zip file could be opened
-		$zip = zip_open($updateFile);
-		if (!is_resource($zip)) {
-			$this->_log->addError(sprintf('Could not open zip file "%s", error: %d', $updateFile, $zip));
-			return false;
-		}
-
-		// Read every file from archive
-		while ($file = zip_read($zip)) {
-			$filename = zip_entry_name($file);
-			$foldername = $this->_installDir . dirname($filename);
-			$absoluteFilename = $this->_installDir . $filename;
-
-			$this->_log->addDebug(sprintf('Updating file "%s"', $filename));
-
-			if (!is_dir($foldername)) {
-				if (!mkdir($foldername, $this->dirPermissions, true)) {
-					$this->_log->addError(sprintf('Directory "%s" has to be writeable!', $parent));
-					return false;
-				}
-			}
-
-			// Skip if entry is a directory
-			if (substr($filename, -1, 1) == '/')
-				continue;
-
-			// Read file contents from archive
-			$contents = zip_entry_read($file, zip_entry_filesize($file));
-
-			if ($contents === false) {
-				$this->_log->addError(sprintf('Coud not read zip entry "%s"', $file));
-				continue;
-			}
-
-			// Write to file
-			if (file_exists($absoluteFilename)) {
-				if (!is_writable($absoluteFilename)) {
-					$this->_log->addError('Could not overwrite "%s"!', $absoluteFilename);
-
-					zip_close($zip);
-					return false;
-				}
-			} else {
-				if (!touch($absoluteFilename)) {
-					$this->_log->addError(sprintf('[SIMULATE] The file "%s" could not be created!', $absoluteFilename));
-					zip_close($zip);
-					return false;
-				}
-
-				$this->_log->addDebug(sprintf('File "%s" created', $absoluteFilename));
-			}
-
-			$updateHandle = @fopen($absoluteFilename, 'w');
-
-			if (!$updateHandle) {
-				$this->_log->addError(sprintf('Could not open file "%s"!', $absoluteFilename));
-				zip_close($zip);
-				return false;
-			}
-
-			if (!fwrite($updateHandle, $contents)) {
-				$this->_log->addError(sprintf('Could not write to file "%s"!', $absoluteFilename));
-				zip_close($zip);
-				return false;
-			}
-
-			fclose($updateHandle);
-
-			//If file is a update script, include
-			if ($filename == $this->updateScriptName) {
-				$this->_log->addDebug(sprintf('Try to include update script "%s"', $absoluteFilename));
-				require($absoluteFilename);
-
-				$this->_log->addInfo(sprintf('Update script "%s" included!', $absoluteFilename));
-				if (!unlink($absoluteFilename)) {
-					$this->_log->addWarning(sprintf('Could not delete update script "%s"!', $absoluteFilename));
-				}
-			}
-		}
-
-		zip_close($zip);
-
-		// TODO
-		$this->_log->addNotice(sprintf('Update "%s" successfully installed', $version));
-
-		return true;
-	}
-
-
-	/**
-	 * Update to the latest version
-	 *
-	 * @param bool $simulateInstall Check for directory and file permissions before copying files (Default: true)
-	 * @param bool $deleteDownload Delete download after update (Default: true)
-	 *
-	 * @return mixed integer|bool
-	 */
-	public function update($simulateInstall = true, $deleteDownload = true) {
-		$this->_log->addInfo('Trying to perform update');
-
-		// Check for latest version
-		if ($this->_latestVersion === null || count($this->_updates) === 0)
-			$this->checkUpdate();
-
-		if ($this->_latestVersion === null || count($this->_updates) === 0) {
-			$this->_log->addError('Could not get latest version from server!');
-			return self::ERROR_VERSION_CHECK;
-		}
-
-		// Check if current version is up to date
-		if (!$this->newVersionAvailable()) {
-			$this->_log->addWarning('No update available!');
-			return self::NO_UPDATE_AVAILABLE;
-		}
-
-		foreach ($this->_updates as $update) {
-			$this->_log->addDebug(sprintf('Update to version "%s"', $update['version']));
-
-			// Check for temp directory
-			if (empty($this->_tempDir) || !is_dir($this->_tempDir) || !is_writable($this->_tempDir)) {
-				$this->_log->addCritical(sprintf('Temporary directory "%s" does not exist or is not writeable!', $this->_tempDir));
-				return self::ERROR_TEMP_DIR;
-			}
-
-			// Check for install directory
-			if (empty($this->_installDir) || !is_dir($this->_installDir) || !is_writable($this->_installDir)) {
-				$this->_log->addCritical(sprintf('Install directory "%s" does not exist or is not writeable!', $this->_installDir));
-				return self::ERROR_INSTALL_DIR;
-			}
-
-			$updateFile = $this->_tempDir . $update['version'] . '.zip';
-
-			// Download update
-			if (!is_file($updateFile)) {
-				if (!$this->_downloadUpdate($update['url'], $updateFile)) {
-					$this->_log->addCritical(sprintf('Failed to download update from "%s" to "%s"!', $update['url'], $updateFile));
-					return self::ERROR_DOWNLOAD_UPDATE;
-				}
-
-				$this->_log->addDebug(sprintf('Latest update downloaded to "%s"', $updateFile));
-			} else {
-				$this->_log->addInfo(sprintf('Latest update already downloaded to "%s"', $updateFile));
-			}
-
-			// Install update
-			$result = $this->_install($updateFile, $simulateInstall, $update['version']);
-			if ($result === true) {
-				if ($deleteDownload) {
-					$this->_log->addDebug(sprintf('Trying to delete update file "%s" after successfull update', $updateFile));
-					if (@unlink($updateFile)) {
-						$this->_log->addInfo(sprintf('Update file "%s" deleted after successfull update', $updateFile));
-					} else {
-						$this->_log->addError(sprintf('Could not delete update file "%s" after successfull update!', $updateFile));
-						return self::ERROR_DELETE_TEMP_UPDATE;
-					}
-				}
-			} else {
-				if ($deleteDownload) {
-					$this->_log->addDebug(sprintf('Trying to delete update file "%s" after failed update', $updateFile));
-					if (@unlink($updateFile)) {
-						$this->_log->addInfo(sprintf('Update file "%s" deleted after failed update', $updateFile));
-					} else {
-						$this->_log->addError(sprintf('Could not delete update file "%s" after failed update!', $updateFile));
-					}
-				}
-
-				return $result;
-			}
-		}
-
-		return true;
-	}
+    /**
+     * Update to the latest version
+     *
+     * @param bool $simulateInstall Check for directory and file permissions before copying files (Default: true)
+     * @param bool $deleteDownload Delete download after update (Default: true)
+     *
+     * @return mixed integer|bool
+     */
+    public function update($simulateInstall = true, $deleteDownload = true)
+    {
+        $this->log('Trying to perform update');
+
+        // Check for latest version
+        if ($this->_latestVersion === null || count($this->_updates) === 0)
+            $this->checkUpdate();
+
+        if ($this->_latestVersion === null || count($this->_updates) === 0) {
+            $this->log('Could not get latest version from server!');
+
+            return self::ERROR_VERSION_CHECK;
+        }
+
+        // Check if current version is up to date
+        if (!$this->newVersionAvailable()) {
+            $this->_log->addWarning('No update available!');
+
+            return self::NO_UPDATE_AVAILABLE;
+        }
+
+        foreach ($this->_updates as $update) {
+            $this->log(sprintf('Update to version "%s"', $update['version']));
+
+            // Check for temp directory
+            if (empty($this->_tempDir) || !is_dir($this->_tempDir) || !is_writable($this->_tempDir)) {
+                $this->log(sprintf('Temporary directory "%s" does not exist or is not writeable!', $this->_tempDir));
+
+                return self::ERROR_TEMP_DIR;
+            }
+
+            // Check for install directory
+            if (empty($this->_installDir) || !is_dir($this->_installDir) || !is_writable($this->_installDir)) {
+                $this->log(sprintf('Install directory "%s" does not exist or is not writeable!', $this->_installDir));
+
+                return self::ERROR_INSTALL_DIR;
+            }
+
+            $updateFile = $this->_tempDir . $update['version'] . '.zip';
+
+            // Download update
+            if (!is_file($updateFile)) {
+                if (!$this->_downloadUpdate($update['url'], $updateFile)) {
+                    $this->log(sprintf('Failed to download update from "%s" to "%s"!', $update['url'], $updateFile));
+
+                    return self::ERROR_DOWNLOAD_UPDATE;
+                }
+
+                $this->log(sprintf('Latest update downloaded to "%s"', $updateFile));
+            } else {
+                $this->log(sprintf('Latest update already downloaded to "%s"', $updateFile));
+            }
+
+            // Install update
+            $result = $this->_install($updateFile, $simulateInstall, $update['version']);
+            if ($result === true) {
+                if ($deleteDownload) {
+                    $this->log(sprintf('Trying to delete update file "%s" after successfull update', $updateFile));
+                    if (@unlink($updateFile)) {
+                        $this->log(sprintf('Update file "%s" deleted after successfull update', $updateFile));
+                    } else {
+                        $this->log(sprintf('Could not delete update file "%s" after successfull update!', $updateFile));
+
+                        return self::ERROR_DELETE_TEMP_UPDATE;
+                    }
+                }
+            } else {
+                if ($deleteDownload) {
+                    $this->log(sprintf('Trying to delete update file "%s" after failed update', $updateFile));
+                    if (@unlink($updateFile)) {
+                        $this->log(sprintf('Update file "%s" deleted after failed update', $updateFile));
+                    } else {
+                        $this->log(sprintf('Could not delete update file "%s" after failed update!', $updateFile));
+                    }
+                }
+
+                return $result;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Add slash at the end of the path.
+     *
+     * @param string $dir
+     * @return string
+     */
+    public function addTrailingSlash($dir)
+    {
+        if (substr($dir, -1) != DIRECTORY_SEPARATOR)
+            $dir = $dir . DIRECTORY_SEPARATOR;
+
+        return $dir;
+    }
 }
diff --git a/vendor/visualappeal/php-auto-update/tests/AutoUpdateTest.php b/vendor/visualappeal/php-auto-update/tests/AutoUpdateTest.php
old mode 100644
new mode 100755
index 86b8e542..50a774b9
--- a/vendor/visualappeal/php-auto-update/tests/AutoUpdateTest.php
+++ b/vendor/visualappeal/php-auto-update/tests/AutoUpdateTest.php
@@ -129,4 +129,16 @@ public function testBranchMaster()
 
 		$this->assertEquals(AutoUpdate::NO_UPDATE_AVAILABLE, $response);
 	}
+
+	/**
+	 * Test the trailing slash method.
+	 */
+	public function testTrailingSlashes()
+	{
+		$dir = DIRECTORY_SEPARATOR . 'test';
+		$this->assertEquals(DIRECTORY_SEPARATOR . 'test' . DIRECTORY_SEPARATOR, $this->_update->addTrailingSlash($dir));
+
+		$dir = DIRECTORY_SEPARATOR . 'test' . DIRECTORY_SEPARATOR;
+		$this->assertEquals(DIRECTORY_SEPARATOR . 'test' . DIRECTORY_SEPARATOR, $this->_update->addTrailingSlash($dir));
+	}
 }
diff --git a/vendor/visualappeal/php-auto-update/tests/fixtures/noUpdateAvailable.ini b/vendor/visualappeal/php-auto-update/tests/fixtures/noUpdateAvailable.ini
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/tests/fixtures/noUpdateAvailable.json b/vendor/visualappeal/php-auto-update/tests/fixtures/noUpdateAvailable.json
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/tests/fixtures/noUpdateAvailable.json.master b/vendor/visualappeal/php-auto-update/tests/fixtures/noUpdateAvailable.json.master
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/tests/fixtures/updateAvailable.ini b/vendor/visualappeal/php-auto-update/tests/fixtures/updateAvailable.ini
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/tests/fixtures/updateAvailable.json b/vendor/visualappeal/php-auto-update/tests/fixtures/updateAvailable.json
old mode 100644
new mode 100755
diff --git a/vendor/visualappeal/php-auto-update/tests/fixtures/updateAvailable.json.dev b/vendor/visualappeal/php-auto-update/tests/fixtures/updateAvailable.json.dev
old mode 100644
new mode 100755