Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master

fix conflict

diff --cc doc/building.rst
index 61d1896e2ca7589a1e84468a78a8444444fdee57,f4866adc49afb9f51e455098f4e6cdb61e94e58b..cae2e3eddc458b6012de517317b205c7070483d0
--- 1/doc/building.rst
--- 2/doc/building.rst
+++ b/doc/building.rst
@@@ -68,9 -68,11 +68,17 @@@ To set up your build environment for de
  
  1. Install Xcode
  2. Install Xcode command line tools::
++<<<<<<< HEAD
 +    xcode-select --install
 +
 +3. Install homebrew::
++=======
+ 
+     xcode-select --install
+ 
+ 3. Install homebrew::
+ 
++>>>>>>> ca9ec4625391ae23940b3a62aaa0afe89f3d98e8
      /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
  
  4. Add the ownCloud repository using the following command::
@@@ -244,11 -246,11 +252,15 @@@ To build the most up-to-date version o
     .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
              where ``target`` is a private location, i.e. in parallel to your build
              dir by specifying ``../install``.
 +            
 +   ..note:: qtkeychain must be compiled with the same prefix e.g CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/
 +
 +   .. note:: Example:: cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/  -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/   -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1
  
+    .. note:: Example:: cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/  -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/  -D_OPENSSL_VERSION=1.0.2a -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1
+ 
+    qtkeychain must be compiled with the same prefix e.g CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ .
+ 
  4. Call ``make``.
  
     The owncloud binary will appear in the ``bin`` directory.