Merge branch 'develop' of http://ci.lab.zammad.com/core/zammad into develop

Conflicts:
	script/local_browser_tests.sh

README.md

@@ -1,12 +1,13 @@
 [![Build Status](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop (MySQL))](http://ci.zammad.org/job/Zammad%20Unittest%20Develop%20(MySQL)/)
 [![Build Status](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop (MariaDB Cluster))](http://ci.zammad.org/job/Zammad%20Unittest%20Develop%20(MariaDB%20Cluster)/)
+
 Welcome to Zammad
 =================
 
 Zammad is a web based open source helpdesk/ticket system with many features
 to manage customer telephone calls and e-mails. It is distributed under the
 GNU AFFERO General Public License (AGPL) and tested on Linux, Solaris, AIX,
-Windows, FreeBSD, OpenBSD and Mac OS 10.x. Do you receive many e-mails and
+FreeBSD, OpenBSD and Mac OS 10.x. Do you receive many e-mails and
 want to answer them with a team of agents? You're going to love Zammad!
 
 

README_Install_Ubuntu.md

@@ -75,8 +75,8 @@
 
 ### Get Zammad
 * cd /var/www/zammad
-* wget http://zammad.org/zammad-1.0.1.tar.gz
-* tar -xzf zammad-1.0.1.tar.gz
+* wget http://zammad.org/zammad-latest.tar.gz
+* tar -xzf zammad-latest.tar.gz
 
 ### Edit Gemfile
 * vi Gemfile

script/local_browser_tests.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 while true; do
-  read -p "Do you wish to drop the database and execute all browser tests?"
+  read -p "Do you wish to drop the database and execute all browser tests?" yn
   case $yn in
     [Yy]* ) echo "Start tests..."; break;;
     [Nn]* ) exit;;

script/websocket-server.rb

@@ -65,7 +65,6 @@ if ARGV[0] != 'start' && ARGV[0] != 'stop'
 end
 
 if ARGV[0] == 'stop'
-
   puts "Stopping websocket server (pid:#{@options[:i]})"
 
   # read pid
@@ -76,8 +75,8 @@ if ARGV[0] == 'stop'
   Process.kill( 9, pid.to_i )
   exit
 end
-if ARGV[0] == 'start' && @options[:d]
 
+if ARGV[0] == 'start' && @options[:d]
   puts "Starting websocket server on #{@options[:b]}:#{@options[:p]} (secure:#{@options[:s]},pid:#{@options[:i]})"
 
   Daemons.daemonize