add namespaces to docstring types

agents/ToplevelAgent.inc

@@ -36,19 +36,19 @@
 		/**
 		 * Current request
 		 * 
-		 * @var Request
+		 * @var \nre\core\Request
 		 */
 		private $request;
 		/**
 		 * Current response
 		 * 
-		 * @var Response
+		 * @var \nre\core\Response
 		 */
 		private $response;
 		/**
 		 * Layout instace
 		 * 
-		 * @var Layout
+		 * @var \nre\core\Layout
 		 */
 		private $layout = null;
 		/**
@@ -64,18 +64,18 @@
 		/**
 		 * Construct a ToplevelAgent.
 		 * 
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ControllerNotValidException
+		 * @throws	\nre\exceptions\ControllerNotValidException
-		 * @throws	ControllerNotFoundException
+		 * @throws	\nre\exceptions\ControllerNotFoundException
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @param	Logger		$log		Log-system
+		 * @param	\nre\core\Logger	$log		Log-system
 		 */
 		protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null)
 		{
@@ -106,10 +106,10 @@
 		/**
 		 * Run the Controller of this Agent and its SubAgents.
 		 * 
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @return	Exception			Last occurred exception of SubAgents
+		 * @return	\Exception				Last occurred exception of SubAgents
 		 */
 		public function run(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -156,7 +156,7 @@
 		/**
 		 * Return the IntermediateAgent.
 		 * 
-		 * @return	IntermediateAgent	IntermediateAgent
+		 * @return	\nre\agents\IntermediateAgent	IntermediateAgent
 		 */
 		public function getIntermediateAgent()
 		{
@@ -169,10 +169,10 @@
 		/**
 		 * Load a SubAgent and add it.
 		 * 
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
-		 * @throws	FatalDatamodelException
+		 * @throws	\nre\exceptions\FatalDatamodelException
-		 * @throws	AgentNotFoundException
+		 * @throws	\nre\exceptions\AgentNotFoundException
-		 * @throws	AgentNotValidException
+		 * @throws	\nre\exceptions\AgentNotValidException
 		 * @param	string	$agentName	Name of the Agent to load
 		 * @param	mixed	…		Additional parameters for the agent
 		 */
@@ -198,7 +198,7 @@
 		/**
 		 * Load IntermediateAgent defined by the current request.
 		 * 
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
 		 */
 		private function loadIntermediateAgent()
 		{
@@ -241,7 +241,7 @@
 		/**
 		 * Load IntermediateAgent defined by the current request.
 		 * 
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
 		 */
 		private function _loadIntermediateAgent()
 		{
@@ -276,13 +276,13 @@
 		/**
 		 * Run the Controller of this Agent and its SubAgents.
 		 * 
-		 * @throws	AccessDeniedException
+		 * @throws	\nre\exceptions\AccessDeniedException
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @return	Exception			Last occurred exception of SubAgents
+		 * @return	\Exception			Last occurred exception of SubAgents
 		 */
 		private function _run(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -304,11 +304,11 @@
 		/**
 		 * Run IntermediateAgent.
 		 * 
-		 * @throws	AccessDeniedException
+		 * @throws	\nre\exceptions\AccessDeniedException
-		 * @throws	ParamsNotValidException
+		 * @throws	\nre\exceptions\ParamsNotValidException
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 */
 		private function runIntermediateAgent()
 		{
@@ -323,8 +323,8 @@
 		 * Handle an error that occurred during
 		 * loading/cnostructing/running of the IntermediateAgent.
 		 * 
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
-		 * @param	Exception	$exception	Occurred exception
+		 * @param	\Exception	$exception	Occurred exception
 		 * @param	int		$httpStatusCode	HTTP-statuscode
 		 * @param	string		$stage		Stage of execution
 		 */

agents/bottomlevel/MailreceiverAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/bottomlevel/MenuAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/bottomlevel/QuestgroupshierarchypathAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/bottomlevel/SeminarybarAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/bottomlevel/SeminarymenuAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/bottomlevel/UserrolesAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: user.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function user(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/AchievementsAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/CharactergroupsAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/CharactergroupsquestsAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/CharactersAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -37,8 +37,8 @@
 		/**
 		 * Action: character.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function character(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/CharactertypesAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/ErrorAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/IntroductionAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/LibraryAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/MailAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/MediaAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/QuestgroupsAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: questgroup.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function questgroup(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -38,8 +38,8 @@
 		/**
 		 * Action: edit.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function edit(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -50,8 +50,8 @@
 		/**
 		 * Action: edittexts.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function edittexts(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -62,8 +62,8 @@
 		/**
 		 * Action: delete.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function delete(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/QuestsAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: quest.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function quest(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -38,8 +38,8 @@
 		/**
 		 * Action: submissions.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function submissions(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -50,8 +50,8 @@
 		/**
 		 * Action: submission.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function submission(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -62,8 +62,8 @@
 		/**
 		 * Action: create.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function create(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -74,8 +74,8 @@
 		/**
 		 * Action: edit.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function edit(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -86,8 +86,8 @@
 		/**
 		 * Action: edittask.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function edittask(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -98,8 +98,8 @@
 		/**
 		 * Action: edittexts.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function edittexts(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -110,8 +110,8 @@
 		/**
 		 * Action: delete.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function delete(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/SeminariesAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/UploadsAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/UsersAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -37,8 +37,8 @@
 		/**
 		 * Action: user.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function user(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/intermediate/XplevelsAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/toplevel/AjaxAgent.inc

@@ -26,9 +26,9 @@
 		/**
 		 * Construct a new AjaxAgent.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @param	Logger		$log		Logger instance
+		 * @param	\nre\core\Logger	$log		Logger instance
 		 */
 		protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null)
 		{
@@ -42,8 +42,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -55,7 +55,7 @@
 		/**
 		 * Set requested language.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
 		 */
 		private function setLanguage(\nre\core\Request $request)
 		{

agents/toplevel/BinaryAgent.inc

@@ -26,9 +26,9 @@
 		/**
 		 * Construct a new BinaryAgent.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @param	Logger		$log		Logger instance
+		 * @param	\nre\core\Logger	$log		Logger instance
 		 */
 		protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null)
 		{
@@ -39,8 +39,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/toplevel/FaultAgent.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/toplevel/HtmlAgent.inc

@@ -26,9 +26,9 @@
 		/**
 		 * Construct a new HtmlAgent.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @param	Logger		$log		Logger instance
+		 * @param	\nre\core\Logger	$log		Logger instance
 		 */
 		protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null)
 		{
@@ -42,8 +42,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -60,7 +60,7 @@
 		/**
 		 * Set requested language.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
 		 */
 		private function setLanguage(\nre\core\Request $request)
 		{

agents/toplevel/HtmlmailAgent.inc

@@ -26,9 +26,9 @@
 		/**
 		 * Construct a new HtmlmailAgent.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @param	Logger		$log		Logger instance
+		 * @param	\nre\core\Logger	$log		Logger instance
 		 */
 		protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null)
 		{
@@ -39,8 +39,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

agents/toplevel/TextmailAgent.inc

@@ -26,9 +26,9 @@
 		/**
 		 * Construct a new TextmailAgent.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @param	Logger		$log		Logger instance
+		 * @param	\nre\core\Logger	$log		Logger instance
 		 */
 		protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null)
 		{
@@ -41,8 +41,8 @@
 		/**
 		 * Action: index.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function index(\nre\core\Request $request, \nre\core\Response $response)
 		{

apis/WebApi.inc

@@ -156,7 +156,7 @@
 		 * Handle an error that orrcurred during the
 		 * loading/constructing/running of the ToplevelAgent.
 		 * 
-		 * @param	Exception	$exception	Occurred exception
+		 * @param	\Exception	$exception	Occurred exception
 		 * @param	int		$httpStatusCode	HTTP-statuscode
 		 */
 		private function error(\nre\core\Exception $exception, $httpStatusCode)
@@ -223,7 +223,7 @@
 		 * Handle a error which cannot be handles by the system (and
 		 * HTTP 503).
 		 * 
-		 * @param	Exception	$exception	Occurred exception
+		 * @param	\Exception	$exception	Occurred exception
 		 */
 		private function errorService($exception)
 		{

app/Controller.inc

@@ -29,13 +29,13 @@
 		/**
 		 * Logger instance
 		 * 
-		 * @var Logger
+		 * @var \nre\core\Logger
 		 */
 		protected $log = null;
 		/**
 		 * Linker instance
 		 * 
-		 * @var Linker
+		 * @var \nre\core\Linker
 		 */
 		protected $linker = null;
 		
@@ -45,14 +45,14 @@
 		/**
 		 * Construct a new application Controller.
 		 * 
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @param	string	$layoutName	Name of the current Layout
+		 * @param	string		$layoutName	Name of the current Layout
-		 * @param	string	$action		Current Action
+		 * @param	string		$action		Current Action
-		 * @param	Agent	$agent		Corresponding Agent
+		 * @param	\nre\core\Agent	$agent		Corresponding Agent
 		 */
 		public function __construct($layoutName, $action, $agent)
 		{
@@ -67,8 +67,8 @@
 		/**
 		 * Prefilter that is executed before running the Controller.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -104,8 +104,8 @@
 		/**
 		 * Postfilter that is executed after running the Controller.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function postFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{

app/Model.inc

@@ -26,11 +26,11 @@
 		/**
 		 * Construct a new application Model.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
 		 */
 		public function __construct()
 		{

app/TextFormatter.inc

@@ -22,14 +22,14 @@
 		/**
 		 * Linker to create links.
 		 * 
-		 * @var Linker
+		 * @var \nre\core\Linker
 		 */
 		private $linker;
 		/**
 		 * Media-Model to retrieve media data
 		 * 
 		 * @static
-		 * @var model
+		 * @var \nre\core\Model
 		 */
 		private static $Media = null;
 		
@@ -39,7 +39,7 @@
 		/**
 		 * Create a new text formatter.
 		 * 
-		 * @param	Linker $linker	Linker to create links with
+		 * @param	\nre\core\Linker $linker	Linker to create links with
 		 */
 		public function __construct(\nre\core\Linker $linker)
 		{

app/Utils.inc

@@ -82,12 +82,12 @@
 		/**
 		 * Send an e‑mail.
 		 * 
-		 * @throws	MailingException
+		 * @throws	\hhu\z\exceptions\MailingException
-		 * @param	mixed	$to		One (string) or many (array) receivers
+		 * @param	mixed			$to		One (string) or many (array) receivers
-		 * @param	string	$messageAction	Message Action
+		 * @param	string			$messageAction	Message Action
-		 * @param	boolean	$html		Whether mail should be formatted as HTML or not
+		 * @param	boolean			$html		Whether mail should be formatted as HTML or not
-		 * @param	array	$params		Parameters to pass
+		 * @param	array			$params		Parameters to pass
-		 * @param	Linker	$linker		Linker instance
+		 * @param	\nre\core\Linker	$linker		Linker instance
 		 */
 		public static function sendMail($to, $messageAction, $html=false, $params=null, $linker=null)
 		{

app/agents/QuesttypeAgent.inc

@@ -22,13 +22,13 @@
 		/**
 		 * Current request
 		 * 
-		 * @var Request
+		 * @var \nre\core\Request
 		 */
 		private $request;
 		/**
 		 * Current response
 		 * 
-		 * @var Response
+		 * @var \nre\core\Response
 		 */
 		private $response;
 		
@@ -39,8 +39,8 @@
 		 * Load a QuesttypeAgent.
 		 * 
 		 * @static
-		 * @throws	QuesttypeAgentNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeAgentNotFoundException
-		 * @throws	QuesttypeAgentNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeAgentNotValidException
 		 * @param	string	$questtypeName	Name of the QuesttypeAgent to load
 		 */
 		public static function load($questtypeName)
@@ -68,14 +68,14 @@
 		 * Instantiate a QuesttypeAgent (Factory Pattern).
 		 * 
 		 * @static
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	QuesttypeModelNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotValidException
-		 * @throws	QuesttypeModelNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotFoundException
-		 * @throws	QuesttypeControllerNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeControllerNotValidException
-		 * @throws	QuesttypeControllerNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeControllerNotFoundException
 		 * @param	string		$questtypeName	Name of the QuesttypeAgent to instantiate
 		 * @param	Request		$request	Current request
 		 * @param	Response	$response	Current respone
@@ -129,7 +129,7 @@
 		 * Load the class of a QuesttypeAgent.
 		 * 
 		 * @static
-		 * @throws	ClassNotFoundException
+		 * @throws	\nre\exceptions\ClassNotFoundException
 		 * @param	string	$questtypeName	Name of the QuesttypeAgent to load
 		 * @param	string	$fullClassName	Name of the class to load
 		 */
@@ -159,7 +159,7 @@
 		 * Check inheritance of the QuesttypeAgent-class.
 		 * 
 		 * @static
-		 * @throws	ClassNotValidException
+		 * @throws	\nre\exceptions\ClassNotValidException
 		 * @param	string	$className		Name of the class to check
 		 * @param	string	$parentClassName	Name of the parent class
 		 */
@@ -179,19 +179,19 @@
 		/**
 		 * Construct a new QuesttypeAgent.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	QuesttypeModelNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotValidException
-		 * @throws	QuesttypeModelNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotFoundException
-		 * @throws	QuesttypeControllerNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeControllerNotValidException
-		 * @throws	QuesttypeControllerNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeControllerNotFoundException
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @param	Logger		$log		Log-system
+		 * @param	\nre\core\Logger	$log		Log-system
 		 */
 		protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null)
 		{
@@ -242,16 +242,16 @@
 		/**
 		 * Load the Controller of this Agent.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	QuesttypeModelNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotValidException
-		 * @throws	QuesttypeModelNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotFoundException
-		 * @throws	QuesttypeControllerNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeControllerNotValidException
-		 * @throws	QuesttypeControllerNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeControllerNotFoundException
 		 */
 		protected function loadController()
 		{

app/agents/ToplevelAgent.inc

@@ -26,9 +26,9 @@
 		/**
 		 * Construct a new ToplevlAgent
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
-		 * @param	Logger		$log		Logger instance
+		 * @param	\nre\core\Logger	$log		Logger instance
 		 */
 		protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null)
 		{

app/apis/MailApi.inc

@@ -46,7 +46,7 @@
 		/**
 		 * Set linker instance for creating links.
 		 * 
-		 * @param	Linker	$linker	Linker instance for creating links
+		 * @param	\nre\core\Linker	$linker	Linker instance for creating links
 		 */
 		public function setLinker(\nre\core\Linker $linker)
 		{
@@ -140,7 +140,7 @@
 		 * 
 		 * This method runs the generation of mailtext.
 		 * 
-		 * @return	Exception	Occured exception or null
+		 * @return	\Exception	Occured exception or null
 		 */
 		public function run()
 		{

app/controllers/IntermediateController.inc

@@ -44,14 +44,14 @@
 		/**
 		 * Construct a new IntermediateController.
 		 * 
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @param	string	$layoutName	Name of the current Layout
+		 * @param	string		$layoutName	Name of the current Layout
-		 * @param	string	$action		Current Action
+		 * @param	string		$action		Current Action
-		 * @param	Agent	$agent		Corresponding Agent
+		 * @param	\nre\core\Agent	$agent		Corresponding Agent
 		 */
 		public function __construct($layoutName, $action, $agent)
 		{
@@ -63,8 +63,8 @@
 		/**
 		 * Prefilter that is executed before running the Controller.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -89,8 +89,8 @@
 		/**
 		 * Postfilter that is executed after running the Controller.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function postFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -153,9 +153,9 @@
 		/**
 		 * Check user permissions.
 		 * 
-		 * @throws AccessDeniedException
+		 * @throws	\nre\exceptions\AccessDeniedException
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		private function checkPermission(\nre\core\Request $request, \nre\core\Response $response)
 		{

app/controllers/QuesttypeController.inc

@@ -75,7 +75,7 @@
 		 * @param	array		$questgroup	Current Questgroup data
 		 * @param	array		$quest		Current Quest data
 		 * @param	array		$character	Current Character data
-		 * @param	Exception	$exception	Character submission exception
+		 * @param	\Exception	$exception	Character submission exception
 		 */
 		public abstract function quest($seminary, $questgroup, $quest, $character, $exception);
 		
@@ -111,8 +111,8 @@
 		 * Load a QuesttypeController.
 		 * 
 		 * @static
-		 * @throws	QuesttypeControllerNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeControllerNotFoundException
-		 * @throws	QuesttypeControllerNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeControllerNotValidException
 		 * @param	string	$controllerName		Name of the QuesttypeController to load
 		 */
 		public static function load($controllerName)
@@ -140,18 +140,18 @@
 		 * Instantiate a QuesttypeController (Factory Pattern).
 		 * 
 		 * @static
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	QuesttypeModelNotValidException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	QuesttypeModelNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotValidException
-		 * @throws	ViewNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotFoundException
-		 * @param	string	$controllerName	Name of the QuesttypeController to instantiate
+		 * @param	string		$controllerName	Name of the QuesttypeController to instantiate
-		 * @param	string	$layoutName	Name of the current Layout
+		 * @param	string		$layoutName	Name of the current Layout
-		 * @param	string	$action		Current Action
+		 * @param	string		$action		Current Action
-		 * @param	Agent	$agent		Corresponding Agent
+		 * @param	\nre\core\Agent	$agent		Corresponding Agent
 		 */
 		public static function factory($controllerName, $layoutName, $action, $agent)
 		{
@@ -183,7 +183,7 @@
 		 * Load the class of a QuesttypeController
 		 * 
 		 * @static
-		 * @throws	ClassNotFoundException
+		 * @throws	\nre\exceptions\ClassNotFoundException
 		 * @param	string	$questtypeName	Name of the QuesttypeController to load
 		 * @param	string	$fullClassName	Name of the class to load
 		 */
@@ -213,7 +213,7 @@
 		 * Check inheritance of the QuesttypeController-class.
 		 * 
 		 * @static
-		 * @throws	ClassNotValidException
+		 * @throws	\nre\exceptions\ClassNotValidException
 		 * @param	string	$className		Name of the class to check
 		 * @param	string	$parentClassName	Name of the parent class
 		 */
@@ -233,13 +233,13 @@
 		/**
 		 * Construct a new application Controller.
 		 * 
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	QuesttypeModelNotValidException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	QuesttypeModelNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotValidException
-		 * @throws	ViewNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotFoundException
 		 * @param	string	$layoutName	Name of the current Layout
 		 * @param	string	$action		Current Action
 		 * @param	Agent	$agent		Corresponding Agent
@@ -255,13 +255,13 @@
 		/**
 		 * Load the Models of this Controller.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	QuesttypeModelNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotValidException
-		 * @throws	QuesttypeModelNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotFoundException
 		 */
 		protected function loadModels()
 		{
@@ -276,8 +276,8 @@
 		/**
 		 * Load the Model of the Questtype.
 		 * 
-		 * @throws	QuesttypeModelNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotValidException
-		 * @throws	QuesttypeModelNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotFoundException
 		 */
 		private function loadModel()
 		{
@@ -296,7 +296,7 @@
 		/**
 		 * Load the View of this QuesttypeController.
 		 * 
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
 		 * @param	string	$layoutName	Name of the current Layout
 		 * @param	string	$action		Current Action
 		 */

app/controllers/SeminaryController.inc

@@ -51,14 +51,14 @@
 		/**
 		 * Construct a new Seminary Controller.
 		 * 
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @param	string	$layoutName	Name of the current Layout
+		 * @param	string		$layoutName	Name of the current Layout
-		 * @param	string	$action		Current Action
+		 * @param	string		$action		Current Action
-		 * @param	Agent	$agent		Corresponding Agent
+		 * @param	\nre\core\Agent	$agent		Corresponding Agent
 		 */
 		public function __construct($layoutName, $action, $agent)
 		{
@@ -70,8 +70,8 @@
 		/**
 		 * Prefilter that is executed before running the Controller.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -112,8 +112,8 @@
 		/**
 		 * Postfilter that is executed after running the Controller.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function postFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -126,8 +126,8 @@
 		 * Check user permissions.
 		 * 
 		 * @throws AccessDeniedException
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		private function checkPermission(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -158,9 +158,9 @@
 		/**
 		 * Check for newly achieved Achievements.
 		 * 
-		 * @param	Request		$request		Current request
+		 * @param	\nre\core\Request	$request		Current request
-		 * @param	Response	$response		Current response
+		 * @param	\nre\core\Response	$response		Current response
-		 * @param	array		$checkConditions	Conditions to check
+		 * @param	array			$checkConditions	Conditions to check
 		 */
 		protected function checkAchievements(\nre\core\Request $request, \nre\core\Response $response, $checkConditions=null)
 		{

app/models/QuesttypeModel.inc

@@ -27,8 +27,8 @@
 		 * Load a Model.
 		 * 
 		 * @static
-		 * @throws	QuesttypeModelNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotFoundException
-		 * @throws	QuesttypeModelNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotValidException
 		 * @param	string	$modelName		Name of the QuesttypeModel to load
 		 */
 		public static function load($modelName)
@@ -88,7 +88,7 @@
 		 * Load the class of a QuesttypeModel.
 		 * 
 		 * @static
-		 * @throws	ClassNotFoundException
+		 * @throws	\nre\exceptions\ClassNotFoundException
 		 * @param	string	$questtypeName	Name of the QuesttypeModel to load
 		 * @param	string	$fullClassName	Name of the class to load
 		 */
@@ -118,7 +118,7 @@
 		 * Check inheritance of the QuesttypeModel-class.
 		 * 
 		 * @static
-		 * @throws	ClassNotValidException
+		 * @throws	\nre\exceptions\ClassNotValidException
 		 * @param	string	$className		Name of the class to check
 		 * @param	string	$parentClassName	Name of the parent class
 		 */
@@ -138,11 +138,11 @@
 		/**
 		 * Construct a new QuesttypeModel.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	QuesttypeModelNotValidException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotValidException
-		 * @throws	QuesttypeModelNotFoundException
+		 * @throws	\hhu\z\exceptions\QuesttypeModelNotFoundException
 		 */
 		public function __construct()
 		{

app/requests/MailRequest.inc

@@ -22,7 +22,7 @@
 		/**
 		 * Linker
 		 * 
-		 * @var Linker
+		 * @var \nre\core\Linker
 		 */
 		private $linker = null;
 		
@@ -80,7 +80,7 @@
 		/**
 		 * Get linker instance for creating links.
 		 * 
-		 * @return	Linker	Linker instance for creating links
+		 * @return	\nre\core\Linker	Linker instance for creating links
 		 */
 		public function getLinker()
 		{

app/views/QuesttypeView.inc

@@ -26,7 +26,7 @@
 		/**
 		 * Load and instantiate the QuesttypeView of a QuesttypeAgent.
 		 * 
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
 		 * @param	string	$layoutName	Name of Layout in use
 		 * @param	string	$agentName	Name of the Agent
 		 * @param	string	$action		Current Action
@@ -43,7 +43,7 @@
 		/**
 		 * Construct a new QuesttypeView.
 		 * 
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
 		 * @param	string	$layoutName	Name of Layout in use
 		 * @param	string	$agentName	Name of the Agent
 		 * @param	string	$action		Current Action

controllers/AchievementsController.inc

@@ -68,7 +68,7 @@
 		 * 
 		 * List Achievements of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of Seminary
 		 */
 		public function index($seminaryUrl)
@@ -208,7 +208,7 @@
 		 * 
 		 * Manage Achievements of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of Seminary
 		 */
 		public function manage($seminaryUrl)
@@ -235,7 +235,7 @@
 		 * 
 		 * Create a new Achievement.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of Seminary
 		 */
 		public function create($seminaryUrl)
@@ -400,7 +400,7 @@
 		 * 
 		 * Move an Achievement up (decrement position).
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of Seminary
 		 * @param	string	$achievementUrl	URL-title of Achievement
 		 */
@@ -426,7 +426,7 @@
 		 * 
 		 * Move an Achievement down (increment position).
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of Seminary
 		 * @param	string	$achievementUrl	URL-title of Achievement
 		 */
@@ -452,7 +452,7 @@
 		 * 
 		 * Edit an Achievement.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of Seminary
 		 * @param	string	$achievementUrl	URL-title of Achievement to edit
 		 */
@@ -660,7 +660,7 @@
 		 * 
 		 * Edit conditions of an Achievement.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of Seminary
 		 * @param	string	$achievementUrl	URL-title of Achievement to edit
 		 */
@@ -921,7 +921,7 @@
 		 * 
 		 * Delete an Achievement.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of Seminary
 		 * @param	string	$achievementUrl	URL-title of Achievement
 		 */

controllers/AjaxController.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Prefilter.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{

controllers/CharactergroupsController.inc

@@ -74,7 +74,7 @@
 		 * 
 		 * Show Character groups-groups for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 */
 		public function index($seminaryUrl)
@@ -102,7 +102,7 @@
 		 * Show Character groups for a Character groups-group of a
 		 * Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 */
@@ -139,7 +139,7 @@
 		 * 
 		 * Create a new Character groups-group for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 */
 		public function creategroupsgroup($seminaryUrl)
@@ -205,7 +205,7 @@
 		 * 
 		 * Edit a Character groups-group of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 */
@@ -274,7 +274,7 @@
 		 * 
 		 * Delete a Character groups-group of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 */
@@ -320,7 +320,7 @@
 		 * Show a Character group for a Character groups-group of a
 		 * Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 * @param	string	$groupUrl		URL-Title of a Character group
@@ -370,7 +370,7 @@
 		 * Manage a Character group for a Character groups-group of a
 		 * Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 * @param	string	$groupUrl		URL-Title of a Character group
@@ -457,7 +457,7 @@
 		 * Create a Character group for a Character groups-group of a
 		 * Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 */
@@ -578,7 +578,7 @@
 		 * Edit a Character group for a Character groups-group of a
 		 * Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 * @param	string	$groupUrl		URL-Title of a Character group
@@ -709,7 +709,7 @@
 		 * Delete a Character group for a Character groups-group of a
 		 * Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 * @param	string	$groupUrl		URL-Title of a Character group

controllers/CharactergroupsquestsController.inc

@@ -58,7 +58,7 @@
 		 * Show a Character groups Quest for a Character groups-group
 		 * of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 * @param	string	$questUrl		URL-Title of a Character groups Quest
@@ -109,7 +109,7 @@
 		 * Manage a Character groups Quest for a Character groups-group
 		 * of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 * @param	string	$questUrl		URL-Title of a Character groups Quest
@@ -402,7 +402,7 @@
 		 * Edit a Character groups Quest of a Character groups-group
 		 * of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 * @param	string	$questUrl		URL-Title of a Character groups Quest
@@ -565,7 +565,7 @@
 		 * Delete a Character groups Quest of a Character groups-group
 		 * of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 * @param	string	$questUrl		URL-Title of a Character groups Quest

controllers/CharactersController.inc

@@ -65,7 +65,7 @@
 		 * 
 		 * List registered Characters for a Seminary
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 * @param	string	$all		Whether to list all Characters at once or not (optional)
 		 */
@@ -140,7 +140,7 @@
 		 * 
 		 * Show a Charater and its details.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 * @param	string	$characterUrl	URL-name of a Charater
 		 */
@@ -226,8 +226,8 @@
 		 * 
 		 * Register a new character for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
-		 * @throws	ParamsNotValidException
+		 * @throws	\nre\exceptions\ParamsNotValidException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 */
 		public function register($seminaryUrl)
@@ -362,7 +362,7 @@
 		 * 
 		 * Manage Characters.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 */
 		public function manage($seminaryUrl)
@@ -471,8 +471,8 @@
 		 * 
 		 * Edit a new character for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
-		 * @throws	ParamsNotValidException
+		 * @throws	\nre\exceptions\ParamsNotValidException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 * @param	string	$characterUrl	URL-name of a Charater
 		 */
@@ -608,7 +608,7 @@
 		 * 
 		 * Delete a Character.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 * @param	string	$characterUrl	URL-name of a Charater
 		 */

controllers/CharactertypesController.inc

@@ -52,7 +52,7 @@
 		 * 
 		 * List Character types.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 */
 		public function index($seminaryUrl)
@@ -103,7 +103,7 @@
 		 * 
 		 * Create new Character type for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 */
 		public function create($seminaryUrl)
@@ -173,7 +173,7 @@
 		 * 
 		 * Edit Character type for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-title of a Seminary
 		 * @param	string	$charactertypeUrl	URL-title of Character type
 		 */
@@ -357,7 +357,7 @@
 		 * 
 		 * Delete Character type for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-title of a Seminary
 		 * @param	string	$charactertypeUrl	URL-title of Character type
 		 */

controllers/HtmlController.inc

@@ -32,8 +32,8 @@
 		/**
 		 * Prefilter.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -47,8 +47,8 @@
 		/**
 		 * Postfilter that is executed after running the Controller.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function postFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{

controllers/HtmlmailController.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Prefilter.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{

controllers/LibraryController.inc

@@ -66,7 +66,7 @@
 		 * 
 		 * List Questtopics of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of Seminary
 		 */
 		public function index($seminaryUrl)
@@ -110,7 +110,7 @@
 		 * 
 		 * Show a Questtopic and its Quests with Questsubtopics.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$eminaryUrl	URL-Title of Seminary
 		 * @param	string	$questtopicUrl	URL-Title of Questtopic
 		 */
@@ -158,7 +158,7 @@
 		 * 
 		 * Manage a Questtopic and its Quests with Questsubtopics.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$eminaryUrl	URL-Title of Seminary
 		 * @param	string	$questtopicUrl	URL-Title of Questtopic
 		 */
@@ -232,7 +232,7 @@
 		 * 
 		 * Create a new Questtopic for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of Seminary
 		 */
 		public function create($seminaryUrl)
@@ -295,7 +295,7 @@
 		 *
 		 * Edit a Questtopic of a Seminary and its Questsubtopics.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$eminaryUrl	URL-Title of Seminary
 		 * @param	string	$questtopicUrl	URL-Title of Questtopic
 		 */
@@ -471,7 +471,7 @@
 		 * 
 		 * Delete a Questtopic of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$eminaryUrl	URL-Title of Seminary
 		 * @param	string	$questtopicUrl	URL-Title of Questtopic
 		 */

controllers/MailController.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Prefilter.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{

controllers/MediaController.inc

@@ -57,8 +57,8 @@
 		/**
 		 * Prefilter.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -102,7 +102,7 @@
 		 * 
 		 * Display the moodpic for a category of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of the Seminary
 		 * @param	string	$category	Category to show moodpic of
 		 * @param	string	$action		Action for processing the media
@@ -149,7 +149,7 @@
 		 * 
 		 * Display a Seminary medium.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of the Seminary
 		 * @param	string	$mediaUrl	URL-name of the medium
 		 * @param	string	$action		Action for processing the media
@@ -180,8 +180,8 @@
 		 * 
 		 * Display an Avatar as full size or portrait.
 		 * 
-		 * @throws	ParamsNotValidException
+		 * @throws	\nre\exceptions\ParamsNotValidException
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-title of the Seminary
 		 * @param	string	$charactertypeUrl	URL-title of Character type
 		 * @param	int	$xplevel		XP-level
@@ -229,7 +229,7 @@
 		 * 
 		 * Display the achievement of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of the Seminary
 		 * @param	string	$achievementUrl	URL-title of the Achievement
 		 * @param	string	$action		Action for processing the media
@@ -286,7 +286,7 @@
 		 * 
 		 * Display the icon for a Character group of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl	URL-Title of a Character groups-group
 		 * @param	string	$groupUrl	URL-Title of a Character group
@@ -328,7 +328,7 @@
 		 * 
 		 * Display the icon for a Character groups Quest of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl	URL-Title of a Character groups-group
 		 * @param	string	$questUrl	URL-Title of a Character groups Quest
@@ -407,8 +407,8 @@
 		/**
 		 * Determine the file for a medium and process it if necessary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
-		 * @throws	ParamsNotValidException
+		 * @throws	\nre\exceptions\ParamsNotValidException
 		 * @param	array	$media	Medium to get file for
 		 * @param	string	$action	Action for processing the media
 		 * @return	object		File for the medium (or null if medium is cached)

controllers/MenuController.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Prefilter.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{

controllers/QuestgroupsController.inc

@@ -68,7 +68,7 @@
 		 * 
 		 * Display a Questgroup and its data.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 * @param	string	$questgroupUrl	URL-Title of a Questgroup
 		 */
@@ -366,7 +366,7 @@
 		 * 
 		 * Edit a Questgroup.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of a Seminary
 		 * @param	string	$questgroupUrl	URL-title of Questgroup to edit
 		 */
@@ -489,7 +489,7 @@
 		 * 
 		 * Edit the texts of a Questgroup.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of a Seminary
 		 * @param	string	$questgroupUrl	URL-title of Questgroup to edit
 		 */
@@ -567,7 +567,7 @@
 		 * 
 		 * Move a Questgroup up (decrement position).
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of Seminary
 		 * @param	string	$questgroupUrl	URL-title of Questgroup
 		 */
@@ -604,7 +604,7 @@
 		 * 
 		 * Move a Questgroup down (increment position).
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of Seminary
 		 * @param	string	$questgroupUrl	URL-title of Questgroup
 		 */
@@ -641,7 +641,7 @@
 		 * 
 		 * Delete a Questgroup.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 * @param	string	$questgroupUrl	URL-Title of a Questgroup
 		 */

controllers/QuestgroupshierarchyController.inc

@@ -154,7 +154,7 @@
 		 * 
 		 * Edit a Questgroupshierarchy.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl			URL-title of Seminary
 		 * @param	string	$questgroupshierarchyUrl	URL-title of Questgroupshierarchy
 		 */
@@ -234,7 +234,7 @@
 		 * 
 		 * Move a Questgroupshierarchy up (decrement position).
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl			URL-title of Seminary
 		 * @param	string	$questgroupshierarchyUrl	URL-title of Questgroupshierarchy
 		 */
@@ -270,7 +270,7 @@
 		 * 
 		 * Move a Questgroupshierarchy down (increment position).
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl			URL-title of Seminary
 		 * @param	string	$questgroupshierarchyUrl	URL-title of Questgroupshierarchy
 		 */
@@ -306,7 +306,7 @@
 		 * 
 		 * Delete a Questgroupshierarchy.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl			URL-title of Seminary
 		 * @param	string	$questgroupshierarchyUrl	URL-title of Questgroupshierarchy
 		 */

controllers/QuestsController.inc

@@ -70,8 +70,8 @@
 		/**
 		 * Prefilter that is executed before running the Controller.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -152,7 +152,7 @@
 		 * 
 		 * Show a quest and its task.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of Seminary
 		 * @param	string	$questgroupUrl		URL-Title of Questgroup
 		 * @param	string	$questUrl		URL-Title of Quest
@@ -348,7 +348,7 @@
 		/**
 		 * List Character submissions for a Quest.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of Seminary
 		 * @param	string	$questgroupUrl	URL-Title of Questgroup
 		 * @param	string	$questUrl	URL-Title of Quest
@@ -403,7 +403,7 @@
 		/**
 		 * Show and handle the submission of a Character for a Quest.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of Seminary
 		 * @param	string	$questgroupUrl	URL-Title of Questgroup
 		 * @param	string	$questUrl	URL-Title of Quest
@@ -614,7 +614,7 @@
 		 * 
 		 * Edit a Quest of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of Seminary
 		 * @param	string	$questgroupUrl		URL-Title of Questgroup
 		 * @param	string	$questUrl		URL-Title of Quest
@@ -788,7 +788,7 @@
 		 * 
 		 * Edit the task of a Quest of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of Seminary
 		 * @param	string	$questgroupUrl		URL-Title of Questgroup
 		 * @param	string	$questUrl		URL-Title of Quest
@@ -838,7 +838,7 @@
 		 * 
 		 * Edit the texts of a Quest of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of Seminary
 		 * @param	string	$questgroupUrl		URL-Title of Questgroup
 		 * @param	string	$questUrl		URL-Title of Quest
@@ -1059,7 +1059,7 @@
 		 * 
 		 * Delete a Quest of a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of Seminary
 		 * @param	string	$questgroupUrl		URL-Title of Questgroup
 		 * @param	string	$questUrl		URL-Title of Quest
@@ -1358,9 +1358,9 @@
 		/**
 		 * Create a response for the Questtype rendering.
 		 * 
-		 * @param	string		$action	Action to run
+		 * @param	string			$action	Action to run
-		 * @param	mixed		$param	Additional parameters to add to the response
+		 * @param	mixed			$param	Additional parameters to add to the response
-		 * @return	Response		Generated response
+		 * @return	\nre\core\Response	Generated response
 		 */
 		private function createQuesttypeResponse($action, $param1)
 		{
@@ -1389,10 +1389,10 @@
 		/**
 		 * Load and construct the QuesttypeAgent for a Questtype.
 		 * 
-		 * @param	string		$questtypeClassname	Name of the class for the Questtype of a Quest
+		 * @param	string				$questtypeClassname	Name of the class for the Questtype of a Quest
-		 * @param	Request		$request		Request
+		 * @param	\nre\core\Request		$request		Request
-		 * @param	Response	$response		Response
+		 * @param	\nre\core\Response		$response		Response
-		 * @return						QuesttypeAgent
+		 * @return	\hhu\z\agents\QuesttypeAgent				Questtype Agent
 		 */
 		private function loadQuesttypeAgent($questtypeClassname, $request, $response)
 		{
@@ -1408,9 +1408,9 @@
 		/**
 		 * Run and render the Agent for a QuesttypeAgent and return ist output.
 		 * 
-		 * @param	Agent		$questtypeAgent		QuesttypeAgent to run and render
+		 * @param	\nre\core\Agent		$questtypeAgent	QuesttypeAgent to run and render
-		 * @param	Request		$request		Request
+		 * @param	\nre\core\Request	$request	Request
-		 * @param	Response	$response		Response
+		 * @param	\nre\core\Response	$response	Response
 		 * @return	string					Rendered output
 		 */
 		private function runQuesttypeAgent($questtypeAgent, $request, $response)

controllers/SeminariesController.inc

@@ -103,7 +103,7 @@
 		 * 
 		 * Show a seminary and its details.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a seminary
 		 */
 		public function seminary($seminaryUrl)
@@ -281,7 +281,7 @@
 		 * 
 		 * Edit a seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a seminary
 		 */
 		public function edit($seminaryUrl)
@@ -397,7 +397,7 @@
 		 * 
 		 * Delete a seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a seminary
 		 */
 		public function delete($seminaryUrl)
@@ -436,7 +436,7 @@
 		 * 
 		 * (Re-) Calculate the amount of achievable XPs for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 */
 		public function calculatexps($seminaryUrl)

controllers/SeminarymenuController.inc

@@ -27,8 +27,8 @@
 		/**
 		 * Prefilter.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{

controllers/TextmailController.inc

@@ -27,8 +27,8 @@
 		/**
 		 * Prefilter.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{

controllers/UploadsController.inc

@@ -50,8 +50,8 @@
 		/**
 		 * Prefilter.
 		 * 
-		 * @param	Request		$request	Current request
+		 * @param	\nre\core\Request	$request	Current request
-		 * @param	Response	$response	Current response
+		 * @param	\nre\core\Response	$response	Current response
 		 */
 		public function preFilter(\nre\core\Request $request, \nre\core\Response $response)
 		{
@@ -70,8 +70,8 @@
 		 * 
 		 * Display a Seminary upload.
 		 * 
-		 * @throws	AccessDeniedException
+		 * @throws	\nre\exceptions\AccessDeniedException
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-title of Seminary
 		 * @param	string	$uploadUrl	URL-name of the upload
 		 * @param	string	$action		Current action (optional)
@@ -134,7 +134,7 @@
 		 * 
 		 * Display the icon of a Character group.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl		URL-Title of a Seminary
 		 * @param	string	$groupsgroupUrl		URL-Title of a Character groups-group
 		 * @param	string	$groupUrl		URL-Title of a Character group
@@ -171,7 +171,7 @@
 		/**
 		 * Determine the file for an upload.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	array	$upload	Upload to get file for
 		 * @return	object		File for the upload (or null if upload is cached)
 		 */

controllers/UserrolesController.inc

@@ -28,7 +28,7 @@
 		 * 
 		 * Show a user and its details.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$userUrl	URL-Username of an user
 		 */
 		public function user($userUrl)

controllers/UsersController.inc

@@ -96,8 +96,8 @@
 		 * 
 		 * Show a user and its details.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
-		 * @throws	AccessDeniedException
+		 * @throws	\nre\exceptions\AccessDeniedException
 		 * @param	string	$userUrl	URL-Username of an user
 		 */
 		public function user($userUrl)
@@ -446,7 +446,7 @@
 		 * 
 		 * Edit a user.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$userUrl	URL-Username of an user
 		 */
 		public function edit($userUrl)
@@ -542,7 +542,7 @@
 		 * 
 		 * Delete a user.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$userUrl	URL-Username of an user
 		 */
 		public function delete($userUrl)

controllers/XplevelsController.inc

@@ -49,7 +49,7 @@
 		 * 
 		 * Manage XP-levels.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a Seminary
 		 */
 		public function manage($seminaryUrl)

core/Agent.inc

@@ -97,14 +97,14 @@
 		 * Instantiate an Agent (Factory Pattern).
 		 * 
 		 * @static
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ControllerNotValidException
+		 * @throws	\nre\exceptions\ControllerNotValidException
-		 * @throws	ControllerNotFoundException
+		 * @throws	\nre\exceptions\ControllerNotFoundException
 		 * @param	string		$agentName	Name of the Agent to instantiate
 		 * @param	Request		$request	Current request
 		 * @param	Response	$respone	Current respone
@@ -156,14 +156,14 @@
 		/**
 		 * Construct a new Agent.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ControllerNotValidException
+		 * @throws	\nre\exceptions\ControllerNotValidException
-		 * @throws	ControllerNotFoundException
+		 * @throws	\nre\exceptions\ControllerNotFoundException
 		 * @param	Request		$request	Current request
 		 * @param	Response	$respone	Current response
 		 * @param	Logger		$log		Log-system
@@ -188,13 +188,13 @@
 		/**
 		 * Run the Controller of this Agent and its SubAgents.
 		 * 
-		 * @throws	ParamsNotValidException
+		 * @throws	\nre\exceptions\ParamsNotValidException
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	ActionNotFoundException
+		 * @throws	\nre\exceptions\ActionNotFoundException
 		 * @param	Request		$request	Current request
 		 * @param	Response	$response	Current response
-		 * @return	Exception			Last occurred exception of SubAgents
+		 * @return	\Exception			Last occurred exception of SubAgents
 		 */
 		public function run(Request $request, Response $response)
 		{
@@ -302,14 +302,14 @@
 		/**
 		 * Load the Controller of this Agent.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ControllerNotValidException
+		 * @throws	\nre\exceptions\ControllerNotValidException
-		 * @throws	ControllerNotFoundException
+		 * @throws	\nre\exceptions\ControllerNotFoundException
 		 */
 		protected function loadController()
 		{
@@ -342,7 +342,7 @@
 		/**
 		 * Log an error.
 		 * 
-		 * @param	Exception	$exception	Occurred exception
+		 * @param	\Exception	$exception	Occurred exception
 		 * @param	int		$logMode	Log mode
 		 */
 		protected function log($exception, $logMode)
@@ -361,9 +361,9 @@
 		/**
 		 * Load a SubAgent and add it.
 		 * 
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
-		 * @throws	AgentNotFoundException
+		 * @throws	\nre\exceptions\AgentNotFoundException
-		 * @throws	AgentNotValidException
+		 * @throws	\nre\exceptions\AgentNotValidException
 		 * @param	string	$agentName	Name of the Agent to load
 		 * @param	mixed	…		Additional parameters for the agent
 		 */
@@ -387,10 +387,10 @@
 		/**
 		 * Load a SubAgent and add it.
 		 * 
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	AgentNotFoundException
+		 * @throws	\nre\exceptions\AgentNotFoundException
-		 * @throws	AgentNotValidException
+		 * @throws	\nre\exceptions\AgentNotValidException
 		 * @param	string	$agentName	Name of the Agent to load
 		 * @param	mixed	…		Additional parameters for the agent
 		 */
@@ -444,7 +444,7 @@
 		/**
 		 * Create a new SubAgent.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	string	$agentName	Agent name
 		 * @return	array			SubAgent
 		 */
@@ -533,7 +533,7 @@
 		 * Create a new InlineError.
 		 * 
 		 * @param	string		$label		Name of the original Agent
-		 * @param	Exception	$exception	Occurred exception
+		 * @param	\Exception	$exception	Occurred exception
 		 */
 		private function newInlineError($label, $exception)
 		{

core/Api.inc

@@ -31,7 +31,7 @@
 		/**
 		 * Der Toplevelagent
 		 * 
-		 * @var ToplevelAgent
+		 * @var \nre\agents\ToplevelAgent
 		 */
 		private $toplevelAgent = null;
 		/**
@@ -74,17 +74,17 @@
 		/**
 		 * Run the application.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ControllerNotValidException
+		 * @throws	\nre\exceptions\ControllerNotValidException
-		 * @throws	ControllerNotFoundException
+		 * @throws	\nre\exceptions\ControllerNotFoundException
-		 * @throws	AgentNotValidException
+		 * @throws	\nre\exceptions\AgentNotValidException
-		 * @throws	AgentNotFoundException
+		 * @throws	\nre\exceptions\AgentNotFoundException
-		 * @return	Exception	Last occurred exception of an subagent
+		 * @return	\Exception	Last occurred exception of an subagent
 		 */
 		public function run()
 		{
@@ -116,7 +116,7 @@
 		/**
 		 * Log an exception
 		 * 
-		 * @param	Exception	$exception	Occurred exception
+		 * @param	\Exception	$exception	Occurred exception
 		 * @param	int		$logMode	Log-mode
 		 */
 		protected function log($exception, $logMode)
@@ -133,9 +133,9 @@
 		/**
 		 * Load the ToplevelAgent specified by the request.
 		 * 
-		 * @throws	ServiceUnavailableException
+		 * @throws	\nre\exceptions\ServiceUnavailableException
-		 * @throws	AgentNotValidException
+		 * @throws	\nre\exceptions\AgentNotValidException
-		 * @throws	AgentNotFoundException
+		 * @throws	\nre\exceptions\AgentNotFoundException
 		 */
 		private function loadToplevelAgent()
 		{

core/ClassLoader.inc

@@ -26,7 +26,7 @@
 		/**
 		 * Load a class.
 		 * 
-		 * @throws	ClassNotFoundException
+		 * @throws	\nre\exceptions\ClassNotFoundException
 		 * @param	string		$className	Name of the class to load
 		 */
 		public static function load($fullClassName)
@@ -55,7 +55,7 @@
 		/**
 		 * Check inheritance of a class.
 		 * 
-		 * @throws	ClassNotValidException
+		 * @throws	\nre\exceptions\ClassNotValidException
 		 * @param	string	$className		Name of the class to check
 		 * @param	string	$parentClassName	Name of the parent class
 		 */

core/Component.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Load the class of a Component.
 		 * 
-		 * @throws	ComponentNotFoundException
+		 * @throws	\nre\exceptions\ComponentNotFoundException
-		 * @throws	ComponentNotValidException
+		 * @throws	\nre\exceptions\ComponentNotValidException
 		 * @param	string	$componentName		Name of the Component to load
 		 */
 		public static function load($componentName)

core/Controller.inc

@@ -56,8 +56,8 @@
 		/**
 		 * Load the class of a Controller.
 		 * 
-		 * @throws	ControllerNotFoundException
+		 * @throws	\nre\exceptions\ControllerNotFoundException
-		 * @throws	ControllerNotValidException
+		 * @throws	\nre\exceptions\ControllerNotValidException
 		 * @param	string	$controllerName		Name of the Controller to load
 		 */
 		public static function load($controllerName)
@@ -84,12 +84,12 @@
 		/**
 		 * Instantiate a Controller (Factory Pattern).
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
 		 * @param	string	$controllerName	Name of the Controller to instantiate
 		 * @param	string	$layoutName	Name of the current Layout
 		 * @param	string	$action		Current Action
@@ -125,11 +125,11 @@
 		/**
 		 * Construct a new Controller.
 		 * 
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
 		 * @param	string	$layoutName	Name of the current Layout
 		 * @param	string	$action		Current Action
 		 * @param	Agent	$agent		Corresponding Agent
@@ -186,10 +186,10 @@
 		 * This method executes the Action of the Controller defined by
 		 * the current Request.
 		 * 
-		 * @throws	ParamsNotValidException
+		 * @throws	\nre\exceptions\ParamsNotValidException
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	ActionNotFoundException
+		 * @throws	\nre\exceptions\ActionNotFoundException
 		 * @param	Request		$request	Current request
 		 * @param	Response	$response	Current response
 		 */
@@ -309,8 +309,8 @@
 		/**
 		 * Load the Components of this Controller.
 		 * 
-		 * @throws	ComponentNotValidException
+		 * @throws	\nre\exceptions\ComponentNotValidException
-		 * @throws	ComponentNotFoundException
+		 * @throws	\nre\exceptions\ComponentNotFoundException
 		 */
 		private function loadComponents()
 		{
@@ -348,11 +348,11 @@
 		/**
 		 * Load the Models of this Controller.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
 		 */
 		protected function loadModels()
 		{
@@ -405,7 +405,7 @@
 		/**
 		 * Load the View of this Controller.
 		 * 
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
 		 * @param	string	$layoutName	Name of the current Layout
 		 * @param	string	$action		Current Action
 		 */

core/Driver.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Load the class of a Driver.
 		 * 
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
 		 * @param	string	$driverName	Name of the Driver to load
 		 */
 		public static function load($driverName)

core/Model.inc

@@ -26,8 +26,8 @@
 		/**
 		 * Load the class of a Model.
 		 * 
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
 		 * @param	string	$modelName		Name of the Model to load
 		 */
 		public static function load($modelName)
@@ -88,11 +88,11 @@
 		 * 
 		 * TODO Catch exception
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
 		 */
 		protected function __construct()
 		{
@@ -106,11 +106,11 @@
 		/**
 		 * Load the Models of this Model.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
-		 * @throws	ModelNotValidException
+		 * @throws	\nre\exceptions\ModelNotValidException
-		 * @throws	ModelNotFoundException
+		 * @throws	\nre\exceptions\ModelNotFoundException
 		 */
 		private function loadModels()
 		{

core/View.inc

@@ -34,7 +34,7 @@
 		/**
 		 * Load and instantiate the View of an Agent.
 		 * 
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
 		 * @param	string	$layoutName	Name of Layout in use
 		 * @param	string	$agentName	Name of the Agent
 		 * @param	string	$action		Current Action
@@ -51,7 +51,7 @@
 		/**
 		 * Construct a new View.
 		 * 
-		 * @throws	ViewNotFoundException
+		 * @throws	\nre\exceptions\ViewNotFoundException
 		 * @param	string	$layoutName	Name of Layout in use
 		 * @param	string	$agentName	Name of the Agent
 		 * @param	string	$action		Current Action

drivers/DatabaseDriver.inc

@@ -77,7 +77,7 @@
 		/**
 		 * Establish a connect to a MqSQL-database.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	array	$config	Connection and login settings
 		 */
 		protected abstract function connect($config);

drivers/MysqliDriver.inc

@@ -26,7 +26,7 @@
 		/**
 		 * Construct a MySQL-driver.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	array	$config	Connection and login settings
 		 */
 		function __construct($config)
@@ -40,7 +40,7 @@
 		/**
 		 * Execute a SQL-query.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	string	$query	Query to run
 		 * @param	mixed	…	Params
 		 * @return	array		Result
@@ -137,7 +137,7 @@
 		/**
 		 * Establish a connect to a MqSQL-database.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	array	$config	Connection and login settings
 		 */
 		protected function connect($config)

exceptions/ServiceUnavailableException.inc

@@ -45,7 +45,7 @@
 		/**
 		 * Construct a new exception.
 		 * 
-		 * @param	Exception	$exception	Exception that has occurred
+		 * @param	\Exception	$exception	Exception that has occurred
 		 */
 		function __construct($exception)
 		{
@@ -65,7 +65,7 @@
 		/**
 		 * Get the exception that hat occurred
 		 * 
-		 * @return	Exception	Exception that has occurred
+		 * @return	\Exception	Exception that has occurred
 		 */
 		public function getException()
 		{

models/CharactergroupsModel.inc

@@ -56,7 +56,7 @@
 		/**
 		 * Get a Character groups-group by its URL.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$seminaryId	ID of the corresponding Seminary
 		 * @param	string	$groupsgroupUrl	URL-name of the Character groups-group
 		 * @return	array			Character groups-group data
@@ -82,7 +82,7 @@
 		/**
 		 * Get a Character groups-group by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$groupsgroupId	ID of the Character groups-group
 		 * @return	array			Character groups-group data
 		 */
@@ -252,7 +252,7 @@
 		/**
 		 * Get a Character group by its URL.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$groupsgroupId	ID of the Character groups-group
 		 * @param	string	$groupUrl	URL-name of the Character group
 		 * @return	array			Character group data
@@ -281,7 +281,7 @@
 		/**
 		 * Get a Character group by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$groupsgroupId	ID of the Character group
 		 * @return	array			Character group data
 		 */

models/CharactergroupsquestsModel.inc

@@ -63,7 +63,7 @@
 		/**
 		 * Get a Character groups Quest by its URL.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$groupsgroupId	ID of the Character groups-group
 		 * @param	string	$questUrl	URL-title of the Character groups Quest
 		 * @return	array			Character groups Quest data
@@ -90,7 +90,7 @@
 		/**
 		 * Get a Character groups Quest by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$questId	ID of the Character groups Quest
 		 * @return	array			Character groups Quest data
 		 */

models/CharactersModel.inc

@@ -241,7 +241,7 @@
 		/**
 		 * Get the character of a user for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$userId		ID of the user
 		 * @param	int	$seminaryId	ID of the Seminary
 		 * @return	array			Character data
@@ -273,7 +273,7 @@
 		/**
 		 * Get a Character by its Url.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$seminaryId	ID of the Seminary
 		 * @param	string	$characterUrl	URL-name of the Character
 		 * @return	array			Character data
@@ -305,7 +305,7 @@
 		/**
 		 * Get a Character by its Id.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$characterId	ID of the Character
 		 * @return	array			Character data
 		 */

models/DatabaseModel.inc

@@ -33,9 +33,9 @@
 		/**
 		 * Construct a new datamase model.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
 		 * @param	string	$type	Database type
 		 * @param	array	$config	Connection settings
 		 */
@@ -56,8 +56,8 @@
 		/**
 		 * Load the database driver.
 		 * 
-		 * @throws	DriverNotFoundException
+		 * @throws	\nre\exceptions\DriverNotFoundException
-		 * @throws	DriverNotValidException
+		 * @throws	\nre\exceptions\DriverNotValidException
 		 * @param	string	$driverName	Name of the database driver
 		 */
 		private function loadDriver($driverName)
@@ -69,7 +69,7 @@
 		/**
 		 * Establish a connection to the database.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	string	$driverName	Name of the database driver
 		 * @param	array	$config		Connection settings
 		 */

models/MediaModel.inc

@@ -37,7 +37,7 @@
 		/**
 		 * Get a medium by its URL.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$mediaURL	URL-name of the Medium
 		 * @return	array			Medium data
 		 */
@@ -62,7 +62,7 @@
 		/**
 		 * Get a medium by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$mediaId	ID of the Medium
 		 * @return	array			Medium data
 		 */
@@ -87,7 +87,7 @@
 		/**
 		 * Get a Seminary medium by its URL.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$seminaryId		ID of the seminary
 		 * @param	string	$seminaryMediaUrl	URL-name of the Seminary medium
 		 * @return	array				Seminary medium data
@@ -113,7 +113,7 @@
 		/**
 		 * Get a Seminary medium by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$seminaryMediaId	ID of the Seminary medium
 		 * @return	array				Seminary medium data
 		 */

models/QuestgroupsModel.inc

@@ -111,7 +111,7 @@
 		/**
 		 * Get a Questgroup by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$questgroupId	ID of a Questgroup
 		 * @return	array			Questgroup data
 		 */
@@ -136,7 +136,7 @@
 		/**
 		 * Get a Questgroup by its URL.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$seminaryId	ID of the corresponding seminary
 		 * @param	string	$questgroupURL	URL-title of a Questgroup
 		 * @return	array			Questgroup data
@@ -586,7 +586,7 @@
 		/**
 		 * Edit a Questgroup.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	int	$questgroupId	ID of Questgroup to edit
 		 * @param	string	$title		New title of Questgroup
 		 */

models/QuestgroupshierarchyModel.inc

@@ -37,7 +37,7 @@
 		/**
 		 * Get a Questgroup hierarchy by its ID.
 		 * 
-		 * throws	IdNotFoundException
+		 * throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$questgroupshierarchyId	ID of a Questgroup hierarchy
 		 * @return	array				Questgroup hierarchy
 		 */
@@ -62,7 +62,7 @@
 		/**
 		 * Get a Questgroup hierarchy by its URL.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$seminaryId			ID of Seminary
 		 * @param	int	$questgroupshierarchyURL	URL of a Questgroup hierarchy
 		 * @return	array					Questgroup hierarchy

models/QuestsModel.inc

@@ -61,7 +61,7 @@
 		/**
 		 * Get a Quest and its data by its URL.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$seminaryId	ID of the corresponding Seminary
 		 * @param	int	$questgroupId	ID of the corresponding Questgroup
 		 * @param	string	$questURL	URL-title of a Quest
@@ -89,7 +89,7 @@
 		/**
 		 * Get a Quest and its data by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$questId	ID of a Quest
 		 * @return	array			Quest data
 		 */

models/QuesttextsModel.inc

@@ -131,7 +131,7 @@
 		/**
 		 * Get corresponding Questtexts for a Questgroup.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$questgroupId	ID of Questgroup to get the Questtexst for
 		 * @param	array			List of Questtexts
 		 */

models/SeminariesModel.inc

@@ -59,7 +59,7 @@
 		/**
 		 * Get a seminary and its data by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryId	ID of a seminary
 		 * @return	array			Seminary
 		 */
@@ -84,7 +84,7 @@
 		/**
 		 * Get a seminary and its data by its URL-title.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$seminaryUrl	URL-Title of a seminary
 		 * @return	array			Seminary
 		 */
@@ -205,7 +205,7 @@
 		/**
 		 * Edit a seminary.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	int	$seminaryId	ID of Seminary to edit
 		 * @param	string	$title		New title of Seminary
 		 * @param	string	$course		New course of Seminary

models/UploadsModel.inc

@@ -88,7 +88,7 @@
 		/**
 		 * Get an upload by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$uploadId	ID of the uploaded file
 		 * @return	array			Upload data
 		 */
@@ -113,7 +113,7 @@
 		/**
 		 * Get an upload by its URL.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$seminaryId	ID of Seminary
 		 * @param	int	$uploadId	ID of the uploaded file
 		 * @return	array			Upload data

models/UsersModel.inc

@@ -59,7 +59,7 @@
 		/**
 		 * Get registered users.
 		 * 
-		 * @throws	ParamsNotValidException
+		 * @throws	\nre\exceptions\ParamsNotValidException
 		 * @param	string	$sort		Field to sort by
 		 * @param	string	$username	Only get users with the given username (optional)
 		 * @param	int	$limit		Limit amount of Characters (optional)
@@ -127,7 +127,7 @@
 		/**
 		 * Get a user and its data by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$userId	ID of an user
 		 * @return	array		Userdata
 		 */
@@ -153,7 +153,7 @@
 		/**
 		 * Get a user and its data by its URL-username.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	string	$userUrl	URL-Username of an user
 		 * @return	array			Userdata
 		 */
@@ -179,7 +179,7 @@
 		/**
 		 * Log a user in if its credentials are valid.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	string	$username	The name of the user to log in
 		 * @param	string	$password	Plaintext password of the user to log in
 		 */
@@ -302,7 +302,7 @@
 		/**
 		 * Edit a user.
 		 * 
-		 * @throws	DatamodelException
+		 * @throws	\nre\exceptions\DatamodelException
 		 * @param	int	$userId		ID of the user to delete
 		 * @param	string	$username	New name of user
 		 * @param	string	$prename	Prename of the user to create

models/XplevelsModel.inc

@@ -37,7 +37,7 @@
 		/**
 		 * Get XP-level by its ID.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$xplevelId	ID of XP-level
 		 * @return	array			XP-level data
 		 */
@@ -62,7 +62,7 @@
 		/**
 		 * Get all XP-levels for a Seminary.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$seminaryId	ID of Seminary
 		 * @return	array			List of XP-level
 		 */

questtypes/bossfight/BossfightQuesttypeController.inc

@@ -93,7 +93,7 @@
 		 * @param	array		$questgroup	Current Questgroup data
 		 * @param	array		$quest		Current Quest data
 		 * @param	array		$character	Current Character data
-		 * @param	Exception	$exception	Character submission exception
+		 * @param	\Exception	$exception	Character submission exception
 		 */
 		public function quest($seminary, $questgroup, $quest, $character, $exception)
 		{
@@ -227,6 +227,23 @@
 		 */
 		public function edittask($seminary, $questgroup, $quest)
 		{
+			$fight = $this->Bossfight->getBossFight($quest['id']);
+			/*
+			if(!is_null($fight['boss_seminarymedia_id'])) {
+				$fight['bossmedia'] = $this->Media->getSeminaryMediaById($fight['boss_seminarymedia_id']);
+			}
+			*/
+			
+			// Get stages
+			$stage = $this->Bossfight->getFirstStage($quest['id']);
+			$stage['childs'] = $this->getChildStages($stage['id']);
+
+
+			// Pass data to view
+			$this->set('seminary', $seminary);
+			$this->set('fight', $fight);
+			$this->set('stages', $stage);
+			//print_r($stage);
 		}
 		
 		
@@ -249,6 +266,26 @@
 				$_SESSION['quests'][$questId]['stages'] = array();
 			}
 		}
+
+
+		/**
+		 * Get all child-stages of a parent-stage.
+		 * 
+		 * @param	int	$stageId	ID of parent-stage
+		 * @return	array			List of child-stages
+		 */
+		private function getChildStages($stageId)
+		{
+			$childStages = $this->Bossfight->getChildStages($stageId);
+			if(!empty($childStages)) {
+				foreach($childStages as &$stage) {
+					$stage['childs'] = $this->getChildStages($stage['id']);
+				}
+			}
+
+
+			return $childStages;
+		}
 		
 	}
 

questtypes/bossfight/BossfightQuesttypeModel.inc

@@ -26,7 +26,7 @@
 		/**
 		 * Get a Boss-Fight.
 		 * 
-		 * @throws	IdNotFoundException
+		 * @throws	\nre\exceptions\IdNotFoundException
 		 * @param	int	$questId	ID of Quest
 		 * @return	array			Boss-Fight data
 		 */

questtypes/bossfight/html/edittask.tpl

@@ -1 +1,41 @@
-<p>TODO</p>
+<form method="post" enctype="multipart/form-data">
+	<fieldset>
+		<legend><?=_('Boss-Fight')?></legend>
+		<label><?=_('Boss name')?></label>
+		<input type="text" name="bossname" value="<?=$fight['bossname']?>" /><br />
+		<label><?=_('Boss image')?></label>
+		<input type="file" name="bossimage" /><br />
+		<label><?=_('Boss lives')?></label>
+		<input type="number" name="lives_boss" value="<?=$fight['lives_boss']?>" /><br />
+		<label><?=_('Character lives')?></label>
+		<input type="number" name="lives_character" value="<?=$fight['lives_character']?>" />
+	</fieldset>
+	<fieldset>
+		<legend><?=_('Stages')?></legend>
+		<?php renderStage($stages, $fight['lives_boss'], $fight['lives_character']); ?>
+	</fieldset>
+	<input type="submit" name="save" value="<?=_('save')?>" />
+</form>
+
+<?php function renderStage($stage, $livesBoss, $livesCharacter, $level=0, $indices=array()) { ?>
+	<div style="margin-left:<?=$level?>em">
+		<h2><?=implode('.', $indices)?></h2>
+		<?php if(!empty($stage['question'])) : ?>
+		<p><?=$stage['question']?></p>
+		<?php endif ?>
+		<p><?=_('Character')?> <?=$livesCharacter?> vs. <?=$livesBoss?> <?=_('Boss')?></p>
+		<p><?=$stage['text']?></p>
+		<?php foreach($stage['childs'] as $index => &$childStage) : ?>
+			<?php $childIndices = $indices; ?>
+			<?php $childIndices[] = $index+1; ?>
+			<?php renderStage($childStage, $livesBoss+$childStage['livedrain_boss'], $livesCharacter+$childStage['livedrain_character'], $level+1, $childIndices); ?>
+		<?php endforeach ?>
+		<?php if($livesBoss == 0 && $livesCharacter == 0) : ?>
+		Bedie verloren
+		<?php elseif($livesBoss == 0) : ?>
+		Boss verloren, Character gewonnen
+		<?php elseif($livesCharacter == 0) : ?>
+		Boss gewonnen, Character verloren
+		<?php endif ?>
+	</div>
+<?php } ?>

questtypes/choiceinput/ChoiceinputQuesttypeController.inc

@@ -110,7 +110,7 @@
 		 * @param	array		$questgroup	Current Questgroup data
 		 * @param	array		$quest		Current Quest data
 		 * @param	array		$character	Current Character data
-		 * @param	Exception	$exception	Character submission exception
+		 * @param	\Exception	$exception	Character submission exception
 		 */
 		public function quest($seminary, $questgroup, $quest, $character, $exception)
 		{

questtypes/crossword/CrosswordQuesttypeController.inc

@@ -169,7 +169,7 @@
 		 * @param	array		$questgroup	Current Questgroup data
 		 * @param	array		$quest		Current Quest data
 		 * @param	array		$character	Current Character data
-		 * @param	Exception	$exception	Character submission exception
+		 * @param	\Exception	$exception	Character submission exception
 		 */
 		public function quest($seminary, $questgroup, $quest, $character, $exception)
 		{

questtypes/dragndrop/DragndropQuesttypeController.inc

@@ -125,7 +125,7 @@
 		 * @param	array		$questgroup	Current Questgroup data
 		 * @param	array		$quest		Current Quest data
 		 * @param	array		$character	Current Character data
-		 * @param	Exception	$exception	Character submission exception
+		 * @param	\Exception	$exception	Character submission exception
 		 */
 		public function quest($seminary, $questgroup, $quest, $character, $exception)
 		{

questtypes/multiplechoice/MultiplechoiceQuesttypeController.inc

@@ -138,7 +138,7 @@
 		 * @param	array		$questgroup	Current Questgroup data
 		 * @param	array		$quest		Current Quest data
 		 * @param	array		$character	Current Character data
-		 * @param	Exception	$exception	Character submission exception
+		 * @param	\Exception	$exception	Character submission exception
 		 */
 		public function quest($seminary, $questgroup, $quest, $character, $exception)
 		{

questtypes/submit/SubmitQuesttypeController.inc

@@ -32,7 +32,7 @@
 		/**
 		 * Save the answers of a Character for a Quest.
 		 * 
-		 * @throws	SubmissionNotValidException
+		 * @throws	\hhu\z\exceptions\SubmissionNotValidException
 		 * @param	array	$seminary	Current Seminary data
 		 * @param	array	$questgroup	Current Questgroup data
 		 * @param	array	$quest		Current Quest data
@@ -137,7 +137,7 @@
 		 * @param	array		$questgroup	Current Questgroup data
 		 * @param	array		$quest		Current Quest data
 		 * @param	array		$character	Current Character data
-		 * @param	Exception	$exception	Character submission exception
+		 * @param	\Exception	$exception	Character submission exception
 		 */
 		public function quest($seminary, $questgroup, $quest, $character, $exception)
 		{

questtypes/textinput/TextinputQuesttypeController.inc

@@ -110,7 +110,7 @@
 		 * @param	array		$questgroup	Current Questgroup data
 		 * @param	array		$quest		Current Quest data
 		 * @param	array		$character	Current Character data
-		 * @param	Exception	$exception	Character submission exception
+		 * @param	\Exception	$exception	Character submission exception
 		 */
 		public function quest($seminary, $questgroup, $quest, $character, $exception)
 		{