Merge pull request #1285 from SoftCreatR/cloudflareCDN

Added Cloudflare as additional JQuery Source

diff --cc com.woltlab.wcf/option.xml
Simple merge

diff --cc com.woltlab.wcf/template/headInclude.tpl
index 199f08910425653eadac96d0417fed08231c3366,eb66b52add7fbe9f75c6089eefba43f6b286548f..542521b9cfb14b1fdc3667700ba2e159afff94f3
--- 1/com.woltlab.wcf/template/headInclude.tpl
--- 2/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@@ -18,9 -18,12 +18,12 @@@
  {if JQUERY_SOURCE == 'google'}
  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>
 -{else if JQUERY_SOURCE == 'microsoft'}
 +{elseif JQUERY_SOURCE == 'microsoft'}
  <script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-2.0.0.min.js"></script>
  <script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.10.2/jquery-ui.min.js"></script>
+ {elseif JQUERY_SOURCE == 'cloudflare'}
+ <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
+ <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>
  {else}
  <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js"></script>
  <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js"></script>

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge