diff --git a/webservice/classes/soap/WSHelper.class.php b/webservice/classes/soap/WSHelper.class.php
index a7e82cb..5bd0058 100755
--- a/webservice/classes/soap/WSHelper.class.php
+++ b/webservice/classes/soap/WSHelper.class.php
@@ -1,183 +1,183 @@
-<?php
-/**
- * Class that generates a WSDL file and creates documentation
- * for the webservices.
- *
- *@author KnowledgeTree Team
- *@package Webservice
- *@version Version 0.9
- */
-class WSHelper {
-	private $uri;
-	private $class = null; //IPReflectionClass object
-	private $name; //class name
-	private $persistence = SOAP_PERSISTENCE_SESSION;
-	private $wsdlfile; //wsdl file name
-	private $server; //soap server object
-
-	public $actor;
-	public $structureMap = array();
-	public $classNameArr = array();
-	public $wsdlFolder; //WSDL cache folder
-	public $useWSDLCache = true;
-
-	public $type = SOAP_RPC;
-	public $use = SOAP_LITERAL;
-
-	/**
-	 * Constructor
-	 * @param string The Uri name
-	 * @return void
-	 */
-	public function __construct($uri, $class=null){
-		$this->uri = $uri;
-		$this->setWSDLCacheFolder($_SERVER['DOCUMENT_ROOT'].dirname($_SERVER['PHP_SELF'])."/wsdl/");
-		if($class) $this->setClass($class);
-	}
-
-	/**
-	 * Adds the given class name to the list of classes
-	 * to be included in the documentation/WSDL/Request handlers
-	 * @param string
-	 * @return void
-	 */
-	public function setClass($name){
-		$this->name = $name;
-		$this->wsdlfile = $this->wsdlFolder.$this->name.".wsdl";
-	}
-
-	public function setWSDLCacheFolder($folder) {
-		$this->wsdlFolder = $folder;
-		//reset wsdlfile
-		$this->wsdlfile = $this->wsdlFolder.$this->name.".wsdl";
-	}
-	/**
-	 * Sets the persistence level for the soap class
-	 */
-	public function setPersistence($persistence) {
-		$this->persistence = $persistence;
-	}
-
-	/**
-	 * Handles everything. Makes sure the webservice is handled,
-	 * documentations is generated, or the wsdl is generated,
-	 * according to the page request
-	 * @return void
-	 */
-	public function handle(){
-		if(substr($_SERVER['QUERY_STRING'], -4) == 'wsdl'){
-		   	$this->showWSDL();
-		}elseif(isset($GLOBALS['HTTP_RAW_POST_DATA']) && strlen($GLOBALS['HTTP_RAW_POST_DATA'])>0){
-			$this->handleRequest();
-		}else{
-			$this->createDocumentation();
-		}
-	}
-	/**
-	 * Checks if the current WSDL is up-to-date, regenerates if necessary and outputs the WSDL
-	 * @return void
-	 */
-	public function showWSDL(){
-		//check if it's a legal webservice class
-		if(!in_array($this->name, $this->classNameArr))
-			throw new Exception("No valid webservice class.");
-
-		//@TODO: nog een mooie oplossing voor het cachen zoeken
-		header("Content-type: text/xml");
-		if($this->useWSDLCache && file_exists($this->wsdlfile)){
-			readfile($this->wsdlfile);
-		}else{
-			//make sure to refresh PHP WSDL cache system
-			ini_set("soap.wsdl_cache_enabled",0);
-			echo $this->createWSDL();
-		}
-	}
-
-	private function createWSDL(){
-		$this->class = new IPReflectionClass($this->name);
-		$wsdl = new WSDLStruct($this->uri, "http://".$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']."?class=".$this->name, $this->type, $this->use);
-		$wsdl->setService($this->class);
-
-		try {
-			$gendoc = $wsdl->generateDocument();
-		} catch (WSDLException $exception) {
-   			$exception->Display();
-   			exit();
-		}
-
-		$fh = fopen($this->wsdlfile, "w+");
-		fwrite($fh, $gendoc);
-		fclose($fh);
-
-		return $gendoc;
-	}
-
-	/**
-	 * Lets the native PHP5 soap implementation handle the request
-	 * after registrating the class
-	 * @return void
-	 */
-	private function handleRequest(){
-		//check if it's a legal webservice class
-		if(!in_array($this->name, $this->classNameArr))
-			throw new Exception("No valid webservice class.");
-
-		//check cache
-		//if(!file_exists($this->wsdlfile))
-			$this->createWSDL();
-
-		$options = Array('actor' => $this->actor, 'classmap' => $this->structureMap);
-
-		header("Content-type: text/xml");
-		$this->server = new SoapServer($this->wsdlfile, $options);
-		$this->server->setClass($this->name);
-		$this->server->setPersistence($this->persistence);
-
-		use_soap_error_handler(true);
-		$this->server->handle();
-	}
-
-	/**
-	 * @param string code
-	 * @param string string
-	 * @param string actor
-	 * @param mixed details
-	 * @param string name
-	 * @return void
-	 */
-	public function fault($code, $string, $actor, $details, $name='') {
-		return $this->server->fault($code, $string, $actor, $details, $name);
-	}
-
-	/**
-	 * Generates the documentations for the webservice usage.
-	 * @TODO: "int", "boolean", "double", "float", "string", "void"
-	 * @param string Template filename
-	 * @return void
-	 */
-	public function createDocumentation($template="classes/soap/templates/docclass.xsl")	{
-		if(!is_file($template))
-			throw new WSException("Could not find the template file: '$template'");
-		$this->class = new IPReflectionClass($this->name);
-		$xtpl = new IPXSLTemplate($template);
-		$documentation = Array();
-		$documentation['menu'] = Array();
-		//loop menu items
-		sort($this->classNameArr);
-		foreach($this->classNameArr as $className) {
-			$documentation['menu'][] = new IPReflectionClass($className);
-		}
-
-		if($this->class){
-			$this->class->properties = $this->class->getProperties(false, false);
-			$this->class->methods = $this->class->getMethods(false, false);
-			foreach((array)$this->class->methods as $method) {
-				$method->params = $method->getParameters();
-			}
-
-			$documentation['class'] = $this->class;
-		}
-		echo $xtpl->execute($documentation);
-	}
-}
+<?php
+/**
+ * Class that generates a WSDL file and creates documentation
+ * for the webservices.
+ *
+ *@author KnowledgeTree Team
+ *@package Webservice
+ *@version Version 0.9
+ */
+class WSHelper {
+	private $uri;
+	private $class = null; //IPReflectionClass object
+	private $name; //class name
+	private $persistence = SOAP_PERSISTENCE_SESSION;
+	private $wsdlfile; //wsdl file name
+	private $server; //soap server object
+
+	public $actor;
+	public $structureMap = array();
+	public $classNameArr = array();
+	public $wsdlFolder; //WSDL cache folder
+	public $useWSDLCache = true;
+
+	public $type = SOAP_RPC;
+	public $use = SOAP_LITERAL;
+
+	/**
+	 * Constructor
+	 * @param string The Uri name
+	 * @return void
+	 */
+	public function __construct($uri, $class=null){
+		$this->uri = $uri;
+		$this->setWSDLCacheFolder($_SERVER['DOCUMENT_ROOT'].dirname($_SERVER['PHP_SELF'])."/wsdl/");
+		if($class) $this->setClass($class);
+	}
+
+	/**
+	 * Adds the given class name to the list of classes
+	 * to be included in the documentation/WSDL/Request handlers
+	 * @param string
+	 * @return void
+	 */
+	public function setClass($name){
+		$this->name = $name;
+		$this->wsdlfile = $this->wsdlFolder.$this->name.".wsdl";
+	}
+
+	public function setWSDLCacheFolder($folder) {
+		$this->wsdlFolder = $folder;
+		//reset wsdlfile
+		$this->wsdlfile = $this->wsdlFolder.$this->name.".wsdl";
+	}
+	/**
+	 * Sets the persistence level for the soap class
+	 */
+	public function setPersistence($persistence) {
+		$this->persistence = $persistence;
+	}
+
+	/**
+	 * Handles everything. Makes sure the webservice is handled,
+	 * documentations is generated, or the wsdl is generated,
+	 * according to the page request
+	 * @return void
+	 */
+	public function handle(){
+		if(substr($_SERVER['QUERY_STRING'], -4) == 'wsdl'){
+		   	$this->showWSDL();
+		}elseif(isset($GLOBALS['HTTP_RAW_POST_DATA']) && strlen($GLOBALS['HTTP_RAW_POST_DATA'])>0){
+			$this->handleRequest();
+		}else{
+			$this->createDocumentation();
+		}
+	}
+	/**
+	 * Checks if the current WSDL is up-to-date, regenerates if necessary and outputs the WSDL
+	 * @return void
+	 */
+	public function showWSDL(){
+		//check if it's a legal webservice class
+		if(!in_array($this->name, $this->classNameArr))
+			throw new Exception("No valid webservice class.");
+
+		//@TODO: nog een mooie oplossing voor het cachen zoeken
+		header("Content-type: text/xml");
+		if($this->useWSDLCache && file_exists($this->wsdlfile)){
+			readfile($this->wsdlfile);
+		}else{
+			//make sure to refresh PHP WSDL cache system
+			ini_set("soap.wsdl_cache_enabled",0);
+			echo $this->createWSDL();
+		}
+	}
+
+	private function createWSDL(){
+		$this->class = new IPReflectionClass($this->name);
+		$wsdl = new WSDLStruct($this->uri, "http://".$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']."?class=".$this->name, $this->type, $this->use);
+		$wsdl->setService($this->class);
+
+		try {
+			$gendoc = $wsdl->generateDocument();
+		} catch (WSDLException $exception) {
+   			$exception->Display();
+   			exit();
+		}
+
+		$fh = fopen($this->wsdlfile, "w+");
+		fwrite($fh, $gendoc);
+		fclose($fh);
+
+		return $gendoc;
+	}
+
+	/**
+	 * Lets the native PHP5 soap implementation handle the request
+	 * after registrating the class
+	 * @return void
+	 */
+	private function handleRequest(){
+		//check if it's a legal webservice class
+		if(!in_array($this->name, $this->classNameArr))
+			throw new Exception("No valid webservice class.");
+
+		//check cache
+		//if(!file_exists($this->wsdlfile))
+			$this->createWSDL();
+
+		$options = Array('actor' => $this->actor, 'classmap' => $this->structureMap);
+
+		header("Content-type: text/xml");
+		$this->server = new SoapServer($this->wsdlfile, $options);
+		$this->server->setClass($this->name);
+		$this->server->setPersistence($this->persistence);
+
+		use_soap_error_handler(true);
+		$this->server->handle();
+	}
+
+	/**
+	 * @param string code
+	 * @param string string
+	 * @param string actor
+	 * @param mixed details
+	 * @param string name
+	 * @return void
+	 */
+	public function fault($code, $string, $actor, $details, $name='') {
+		return $this->server->fault($code, $string, $actor, $details, $name);
+	}
+
+	/**
+	 * Generates the documentations for the webservice usage.
+	 * @TODO: "int", "boolean", "double", "float", "string", "void"
+	 * @param string Template filename
+	 * @return void
+	 */
+	public function createDocumentation($template="classes/soap/templates/docclass.xsl")	{
+		if(!is_file($template))
+			throw new WSException("Could not find the template file: '$template'");
+		$this->class = new IPReflectionClass($this->name);
+		$xtpl = new IPXSLTemplate($template);
+		$documentation = Array();
+		$documentation['menu'] = Array();
+		//loop menu items
+		sort($this->classNameArr);
+		foreach($this->classNameArr as $className) {
+			$documentation['menu'][] = new IPReflectionClass($className);
+		}
+
+		if($this->class){
+			$this->class->properties = $this->class->getProperties(false, false);
+			$this->class->methods = $this->class->getMethods(false, false);
+			foreach((array)$this->class->methods as $method) {
+				$method->params = $method->getParameters();
+			}
+
+			$documentation['class'] = $this->class;
+		}
+		echo $xtpl->execute($documentation);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/webservice/classes/soap/templates/str.replace.function.xsl b/webservice/classes/soap/templates/str.replace.function.xsl
index 5d74e86..626e549 100755
--- a/webservice/classes/soap/templates/str.replace.function.xsl
+++ b/webservice/classes/soap/templates/str.replace.function.xsl
@@ -1,105 +1,105 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:str="http://exslt.org/strings"
-                xmlns:func="http://exslt.org/functions"
-                xmlns:exsl="http://exslt.org/common"
-                extension-element-prefixes="str exsl func">
-
-<func:function name="str:replace">
-	<xsl:param name="string" select="''" />
-   <xsl:param name="search" select="/.." />
-   <xsl:param name="replace" select="/.." />
-   <xsl:choose>
-      <xsl:when test="not($string)">
-        <func:result select="/.." />
-      </xsl:when>
-      <xsl:when test="function-available('exsl:node-set')">
-         <!-- this converts the search and replace arguments to node sets
-              if they are one of the other XPath types -->
-         <xsl:variable name="search-nodes-rtf">
-           <xsl:copy-of select="$search" />
-         </xsl:variable>
-         <xsl:variable name="replace-nodes-rtf">
-           <xsl:copy-of select="$replace" />
-         </xsl:variable>
-         <xsl:variable name="replacements-rtf">
-            <xsl:for-each select="exsl:node-set($search-nodes-rtf)/node()">
-               <xsl:variable name="pos" select="position()" />
-               <replace search="{.}">
-                  <xsl:copy-of select="exsl:node-set($replace-nodes-rtf)/node()[$pos]" />
-               </replace>
-            </xsl:for-each>
-         </xsl:variable>
-         <xsl:variable name="sorted-replacements-rtf">
-            <xsl:for-each select="exsl:node-set($replacements-rtf)/replace">
-               <xsl:sort select="string-length(@search)" data-type="number" order="descending" />
-               <xsl:copy-of select="." />
-            </xsl:for-each>
-         </xsl:variable>
-         <xsl:variable name="result">
-           <xsl:choose>
-              <xsl:when test="not($search)">
-                <xsl:value-of select="$string" />
-              </xsl:when>
-             <xsl:otherwise>
-               <xsl:call-template name="str:_replace">
-                  <xsl:with-param name="string" select="$string" />
-                  <xsl:with-param name="replacements" select="exsl:node-set($sorted-replacements-rtf)/replace" />
-               </xsl:call-template>
-             </xsl:otherwise>
-           </xsl:choose>
-         </xsl:variable>
-         <func:result select="exsl:node-set($result)/node()" />
-      </xsl:when>
-      <xsl:otherwise>
-         <xsl:message terminate="yes">
-            ERROR: function implementation of str:replace() relies on exsl:node-set().
-         </xsl:message>
-      </xsl:otherwise>
-   </xsl:choose>
-</func:function>
-
-<xsl:template name="str:_replace">
-  <xsl:param name="string" select="''" />
-  <xsl:param name="replacements" select="/.." />
-  <xsl:choose>
-    <xsl:when test="not($string)" />
-    <xsl:when test="not($replacements)">
-      <xsl:value-of select="$string" />
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="replacement" select="$replacements[1]" />
-      <xsl:variable name="search" select="$replacement/@search" />
-      <xsl:choose>
-        <xsl:when test="not(string($search))">
-          <xsl:value-of select="substring($string, 1, 1)" />
-          <xsl:copy-of select="$replacement/node()" />
-          <xsl:call-template name="str:_replace">
-            <xsl:with-param name="string" select="substring($string, 2)" />
-            <xsl:with-param name="replacements" select="$replacements" />
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="contains($string, $search)">
-          <xsl:call-template name="str:_replace">
-            <xsl:with-param name="string" select="substring-before($string, $search)" />
-            <xsl:with-param name="replacements" select="$replacements[position() > 1]" />
-          </xsl:call-template>      
-          <xsl:copy-of select="$replacement/node()" />
-          <xsl:call-template name="str:_replace">
-            <xsl:with-param name="string" select="substring-after($string, $search)" />
-            <xsl:with-param name="replacements" select="$replacements" />
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="str:_replace">
-            <xsl:with-param name="string" select="$string" />
-            <xsl:with-param name="replacements" select="$replacements[position() > 1]" />
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:str="http://exslt.org/strings"
+                xmlns:func="http://exslt.org/functions"
+                xmlns:exsl="http://exslt.org/common"
+                extension-element-prefixes="str exsl func">
+
+<func:function name="str:replace">
+	<xsl:param name="string" select="''" />
+   <xsl:param name="search" select="/.." />
+   <xsl:param name="replace" select="/.." />
+   <xsl:choose>
+      <xsl:when test="not($string)">
+        <func:result select="/.." />
+      </xsl:when>
+      <xsl:when test="function-available('exsl:node-set')">
+         <!-- this converts the search and replace arguments to node sets
+              if they are one of the other XPath types -->
+         <xsl:variable name="search-nodes-rtf">
+           <xsl:copy-of select="$search" />
+         </xsl:variable>
+         <xsl:variable name="replace-nodes-rtf">
+           <xsl:copy-of select="$replace" />
+         </xsl:variable>
+         <xsl:variable name="replacements-rtf">
+            <xsl:for-each select="exsl:node-set($search-nodes-rtf)/node()">
+               <xsl:variable name="pos" select="position()" />
+               <replace search="{.}">
+                  <xsl:copy-of select="exsl:node-set($replace-nodes-rtf)/node()[$pos]" />
+               </replace>
+            </xsl:for-each>
+         </xsl:variable>
+         <xsl:variable name="sorted-replacements-rtf">
+            <xsl:for-each select="exsl:node-set($replacements-rtf)/replace">
+               <xsl:sort select="string-length(@search)" data-type="number" order="descending" />
+               <xsl:copy-of select="." />
+            </xsl:for-each>
+         </xsl:variable>
+         <xsl:variable name="result">
+           <xsl:choose>
+              <xsl:when test="not($search)">
+                <xsl:value-of select="$string" />
+              </xsl:when>
+             <xsl:otherwise>
+               <xsl:call-template name="str:_replace">
+                  <xsl:with-param name="string" select="$string" />
+                  <xsl:with-param name="replacements" select="exsl:node-set($sorted-replacements-rtf)/replace" />
+               </xsl:call-template>
+             </xsl:otherwise>
+           </xsl:choose>
+         </xsl:variable>
+         <func:result select="exsl:node-set($result)/node()" />
+      </xsl:when>
+      <xsl:otherwise>
+         <xsl:message terminate="yes">
+            ERROR: function implementation of str:replace() relies on exsl:node-set().
+         </xsl:message>
+      </xsl:otherwise>
+   </xsl:choose>
+</func:function>
+
+<xsl:template name="str:_replace">
+  <xsl:param name="string" select="''" />
+  <xsl:param name="replacements" select="/.." />
+  <xsl:choose>
+    <xsl:when test="not($string)" />
+    <xsl:when test="not($replacements)">
+      <xsl:value-of select="$string" />
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:variable name="replacement" select="$replacements[1]" />
+      <xsl:variable name="search" select="$replacement/@search" />
+      <xsl:choose>
+        <xsl:when test="not(string($search))">
+          <xsl:value-of select="substring($string, 1, 1)" />
+          <xsl:copy-of select="$replacement/node()" />
+          <xsl:call-template name="str:_replace">
+            <xsl:with-param name="string" select="substring($string, 2)" />
+            <xsl:with-param name="replacements" select="$replacements" />
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:when test="contains($string, $search)">
+          <xsl:call-template name="str:_replace">
+            <xsl:with-param name="string" select="substring-before($string, $search)" />
+            <xsl:with-param name="replacements" select="$replacements[position() > 1]" />
+          </xsl:call-template>      
+          <xsl:copy-of select="$replacement/node()" />
+          <xsl:call-template name="str:_replace">
+            <xsl:with-param name="string" select="substring-after($string, $search)" />
+            <xsl:with-param name="replacements" select="$replacements" />
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="str:_replace">
+            <xsl:with-param name="string" select="$string" />
+            <xsl:with-param name="replacements" select="$replacements[position() > 1]" />
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/webservice/tests/annotations.php b/webservice/tests/annotations.php
index e10ef44..a0ee1ff 100755
--- a/webservice/tests/annotations.php
+++ b/webservice/tests/annotations.php
@@ -1,44 +1,44 @@
-<?
-chdir("..");
-include "common.php";
-
-class DefaultController {
-	const TYPE_PLAIN = 1;
-	const TYPE_HTML = 2;
-	public $type;
-	public $length;
-}
-/**
- * @ann1('me'=>'you');
- */
-class something{
-	/**
-	 * @var string
-	 * @Controller(type => DefaultController::TYPE_PLAIN, length => 100)
-	 */
-	public $propertyA;
-	
-	/**
-	 * @var string
-	 * @Controller(type => DefaultController::TYPE_HTML, length => 100)
-	 */
-	public function methodB () {
-		return "aap";
-	}
-}
-
-/* Annotation example */
-$rel = new IPReflectionClass("something");
-$properties = $rel->getProperties();
-$methods = $rel->getMethods();
-
-var_dump($rel->getAnnotation("ann1", "stdClass"));
-
-$property = $properties["propertyA"];
-$ann = $property->getAnnotation("Controller", "DefaultController");
-var_dump($ann);
-
-$method = $methods["methodB"];
-$ann = $method->getAnnotation("Controller", "DefaultController");
-var_dump($ann);
+<?
+chdir("..");
+include "common.php";
+
+class DefaultController {
+	const TYPE_PLAIN = 1;
+	const TYPE_HTML = 2;
+	public $type;
+	public $length;
+}
+/**
+ * @ann1('me'=>'you');
+ */
+class something{
+	/**
+	 * @var string
+	 * @Controller(type => DefaultController::TYPE_PLAIN, length => 100)
+	 */
+	public $propertyA;
+	
+	/**
+	 * @var string
+	 * @Controller(type => DefaultController::TYPE_HTML, length => 100)
+	 */
+	public function methodB () {
+		return "aap";
+	}
+}
+
+/* Annotation example */
+$rel = new IPReflectionClass("something");
+$properties = $rel->getProperties();
+$methods = $rel->getMethods();
+
+var_dump($rel->getAnnotation("ann1", "stdClass"));
+
+$property = $properties["propertyA"];
+$ann = $property->getAnnotation("Controller", "DefaultController");
+var_dump($ann);
+
+$method = $methods["methodB"];
+$ann = $method->getAnnotation("Controller", "DefaultController");
+var_dump($ann);
 ?>
\ No newline at end of file