diff --git a/samples/docs/swagger-static-docs/src/main/webapp/assets/js/main.js b/samples/docs/swagger-static-docs/src/main/webapp/assets/js/main.js
index 979af06e531..660d628567c 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/assets/js/main.js
+++ b/samples/docs/swagger-static-docs/src/main/webapp/assets/js/main.js
@@ -72,4 +72,4 @@ $(function(){
     $(window).bind('hashchange', function() {
         choose(window.location.href.toString());
     });
-});
+});
\ No newline at end of file
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/index.html b/samples/docs/swagger-static-docs/src/main/webapp/index.html
index 556b297b5d3..529f1aa4fd9 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/index.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/index.html
@@ -31,66 +31,66 @@
         </div>
     		<div class="section-box">
           <div class="section-header">
-            <a href="/#!/WordListsApi">WordListsApi</a>
+            <a href="#!/WordListsApi">WordListsApi</a>
           </div>
           <ul>
-			      <li><a href="/#!/WordListsApi#createWordList">createWordList</a></li>
+			      <li><a href="#!/WordListsApi#createWordList">createWordList</a></li>
             </ul>
         </div>
         <div class="section-box">
           <div class="section-header">
-            <a href="/#!/WordsApi">WordsApi</a>
+            <a href="#!/AccountApi">AccountApi</a>
           </div>
           <ul>
-			      <li><a href="/#!/WordsApi#searchWords">searchWords</a></li>
-            <li><a href="/#!/WordsApi#getWordOfTheDay">getWordOfTheDay</a></li>
-            <li><a href="/#!/WordsApi#reverseDictionary">reverseDictionary</a></li>
-            <li><a href="/#!/WordsApi#getRandomWords">getRandomWords</a></li>
-            <li><a href="/#!/WordsApi#getRandomWord">getRandomWord</a></li>
+			      <li><a href="#!/AccountApi#authenticate">authenticate</a></li>
+            <li><a href="#!/AccountApi#authenticatePost">authenticatePost</a></li>
+            <li><a href="#!/AccountApi#getWordListsForLoggedInUser">getWordListsForLoggedInUser</a></li>
+            <li><a href="#!/AccountApi#getApiTokenStatus">getApiTokenStatus</a></li>
+            <li><a href="#!/AccountApi#getLoggedInUser">getLoggedInUser</a></li>
             </ul>
         </div>
         <div class="section-box">
           <div class="section-header">
-            <a href="/#!/AccountApi">AccountApi</a>
+            <a href="#!/WordListApi">WordListApi</a>
           </div>
           <ul>
-			      <li><a href="/#!/AccountApi#authenticate">authenticate</a></li>
-            <li><a href="/#!/AccountApi#authenticatePost">authenticatePost</a></li>
-            <li><a href="/#!/AccountApi#getWordListsForLoggedInUser">getWordListsForLoggedInUser</a></li>
-            <li><a href="/#!/AccountApi#getApiTokenStatus">getApiTokenStatus</a></li>
-            <li><a href="/#!/AccountApi#getLoggedInUser">getLoggedInUser</a></li>
+			      <li><a href="#!/WordListApi#updateWordList">updateWordList</a></li>
+            <li><a href="#!/WordListApi#deleteWordList">deleteWordList</a></li>
+            <li><a href="#!/WordListApi#getWordListByPermalink">getWordListByPermalink</a></li>
+            <li><a href="#!/WordListApi#addWordsToWordList">addWordsToWordList</a></li>
+            <li><a href="#!/WordListApi#getWordListWords">getWordListWords</a></li>
+            <li><a href="#!/WordListApi#deleteWordsFromWordList">deleteWordsFromWordList</a></li>
             </ul>
         </div>
         <div class="section-box">
           <div class="section-header">
-            <a href="/#!/WordListApi">WordListApi</a>
+            <a href="#!/WordApi">WordApi</a>
           </div>
           <ul>
-			      <li><a href="/#!/WordListApi#updateWordList">updateWordList</a></li>
-            <li><a href="/#!/WordListApi#deleteWordList">deleteWordList</a></li>
-            <li><a href="/#!/WordListApi#getWordListByPermalink">getWordListByPermalink</a></li>
-            <li><a href="/#!/WordListApi#addWordsToWordList">addWordsToWordList</a></li>
-            <li><a href="/#!/WordListApi#getWordListWords">getWordListWords</a></li>
-            <li><a href="/#!/WordListApi#deleteWordsFromWordList">deleteWordsFromWordList</a></li>
+			      <li><a href="#!/WordApi#getExamples">getExamples</a></li>
+            <li><a href="#!/WordApi#getWord">getWord</a></li>
+            <li><a href="#!/WordApi#getDefinitions">getDefinitions</a></li>
+            <li><a href="#!/WordApi#getTopExample">getTopExample</a></li>
+            <li><a href="#!/WordApi#getRelatedWords">getRelatedWords</a></li>
+            <li><a href="#!/WordApi#getTextPronunciations">getTextPronunciations</a></li>
+            <li><a href="#!/WordApi#getHyphenation">getHyphenation</a></li>
+            <li><a href="#!/WordApi#getWordFrequency">getWordFrequency</a></li>
+            <li><a href="#!/WordApi#getPhrases">getPhrases</a></li>
+            <li><a href="#!/WordApi#getEtymologies">getEtymologies</a></li>
+            <li><a href="#!/WordApi#getAudio">getAudio</a></li>
+            <li><a href="#!/WordApi#getScrabbleScore">getScrabbleScore</a></li>
             </ul>
         </div>
         <div class="section-box">
           <div class="section-header">
-            <a href="/#!/WordApi">WordApi</a>
+            <a href="#!/WordsApi">WordsApi</a>
           </div>
           <ul>
-			      <li><a href="/#!/WordApi#getExamples">getExamples</a></li>
-            <li><a href="/#!/WordApi#getWord">getWord</a></li>
-            <li><a href="/#!/WordApi#getDefinitions">getDefinitions</a></li>
-            <li><a href="/#!/WordApi#getTopExample">getTopExample</a></li>
-            <li><a href="/#!/WordApi#getRelatedWords">getRelatedWords</a></li>
-            <li><a href="/#!/WordApi#getTextPronunciations">getTextPronunciations</a></li>
-            <li><a href="/#!/WordApi#getHyphenation">getHyphenation</a></li>
-            <li><a href="/#!/WordApi#getWordFrequency">getWordFrequency</a></li>
-            <li><a href="/#!/WordApi#getPhrases">getPhrases</a></li>
-            <li><a href="/#!/WordApi#getEtymologies">getEtymologies</a></li>
-            <li><a href="/#!/WordApi#getAudio">getAudio</a></li>
-            <li><a href="/#!/WordApi#getScrabbleScore">getScrabbleScore</a></li>
+			      <li><a href="#!/WordsApi#searchWords">searchWords</a></li>
+            <li><a href="#!/WordsApi#getWordOfTheDay">getWordOfTheDay</a></li>
+            <li><a href="#!/WordsApi#reverseDictionary">reverseDictionary</a></li>
+            <li><a href="#!/WordsApi#getRandomWords">getRandomWords</a></li>
+            <li><a href="#!/WordsApi#getRandomWord">getRandomWord</a></li>
             </ul>
         </div>
         </div>
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/ApiTokenStatus.html b/samples/docs/swagger-static-docs/src/main/webapp/models/ApiTokenStatus.html
index b4a95172d34..9c8272a24ba 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/ApiTokenStatus.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/ApiTokenStatus.html
@@ -1,32 +1,32 @@
 <h2>ApiTokenStatus</h2>
   <ul class="parameter">
-  <li class="param-required-false">valid : boolean
-	  <div class="param-description"></div>
+  <li class="param-required-">valid : boolean
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">token : string
-	  <div class="param-description"></div>
+  <li class="param-required-">token : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">resetsInMillis : long
-	  <div class="param-description"></div>
+  <li class="param-required-">resetsInMillis : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">remainingCalls : long
-	  <div class="param-description"></div>
+  <li class="param-required-">remainingCalls : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">expiresInMillis : long
-	  <div class="param-description"></div>
+  <li class="param-required-">expiresInMillis : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">totalRequests : long
-	  <div class="param-description"></div>
+  <li class="param-required-">totalRequests : long
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/AudioFile.html b/samples/docs/swagger-static-docs/src/main/webapp/models/AudioFile.html
index c1a690fe023..6cd8d6702bb 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/AudioFile.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/AudioFile.html
@@ -1,72 +1,72 @@
 <h2>AudioFile</h2>
   <ul class="parameter">
-  <li class="param-required-false">attributionUrl : string
-	  <div class="param-description"></div>
+  <li class="param-required-">attributionUrl : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">commentCount : int
-	  <div class="param-description"></div>
+  <li class="param-required-">commentCount : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">voteCount : int
-	  <div class="param-description"></div>
+  <li class="param-required-">voteCount : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">fileUrl : string
-	  <div class="param-description"></div>
+  <li class="param-required-">fileUrl : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">audioType : string
-	  <div class="param-description"></div>
+  <li class="param-required-">audioType : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
   <li class="param-required-true">id : long
-	  <div class="param-description"></div>
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">duration : double
-	  <div class="param-description"></div>
+  <li class="param-required-">duration : double
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">attributionText : string
-	  <div class="param-description"></div>
+  <li class="param-required-">attributionText : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">createdBy : string
-	  <div class="param-description"></div>
+  <li class="param-required-">createdBy : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">description : string
-	  <div class="param-description"></div>
+  <li class="param-required-">description : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">createdAt : Date
-	  <div class="param-description"></div>
+  <li class="param-required-">createdAt : Date
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">voteWeightedAverage : float
-	  <div class="param-description"></div>
+  <li class="param-required-">voteWeightedAverage : float
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">voteAverage : float
-	  <div class="param-description"></div>
+  <li class="param-required-">voteAverage : float
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/AuthenticationToken.html b/samples/docs/swagger-static-docs/src/main/webapp/models/AuthenticationToken.html
index 8e196cc9090..eceee3c951d 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/AuthenticationToken.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/AuthenticationToken.html
@@ -1,17 +1,17 @@
 <h2>AuthenticationToken</h2>
   <ul class="parameter">
-  <li class="param-required-false">token : string
-	  <div class="param-description"></div>
+  <li class="param-required-">token : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">userId : long
-	  <div class="param-description"></div>
+  <li class="param-required-">userId : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">userSignature : string
-	  <div class="param-description"></div>
+  <li class="param-required-">userSignature : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Bigram.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Bigram.html
index 73b29fda58b..7ecdc9fa48a 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Bigram.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Bigram.html
@@ -1,27 +1,27 @@
 <h2>Bigram</h2>
   <ul class="parameter">
-  <li class="param-required-false">count : long
-	  <div class="param-description"></div>
+  <li class="param-required-">count : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">gram2 : string
-	  <div class="param-description"></div>
+  <li class="param-required-">gram2 : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">gram1 : string
-	  <div class="param-description"></div>
+  <li class="param-required-">gram1 : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">wlmi : double
-	  <div class="param-description"></div>
+  <li class="param-required-">wlmi : double
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">mi : double
-	  <div class="param-description"></div>
+  <li class="param-required-">mi : double
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Citation.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Citation.html
index 0d0db9cd063..340a622127f 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Citation.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Citation.html
@@ -1,12 +1,12 @@
 <h2>Citation</h2>
   <ul class="parameter">
-  <li class="param-required-false">cite : string
-	  <div class="param-description"></div>
+  <li class="param-required-">cite : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">source : string
-	  <div class="param-description"></div>
+  <li class="param-required-">source : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/ContentProvider.html b/samples/docs/swagger-static-docs/src/main/webapp/models/ContentProvider.html
index 64a6ebbf313..ebb427de9df 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/ContentProvider.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/ContentProvider.html
@@ -1,12 +1,12 @@
 <h2>ContentProvider</h2>
   <ul class="parameter">
-  <li class="param-required-false">id : int
-	  <div class="param-description"></div>
+  <li class="param-required-">id : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">name : string
-	  <div class="param-description"></div>
+  <li class="param-required-">name : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Definition.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Definition.html
index b59e5d06467..baf6f12ea29 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Definition.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Definition.html
@@ -1,82 +1,82 @@
 <h2>Definition</h2>
   <ul class="parameter">
-  <li class="param-required-false">extendedText : string
-	  <div class="param-description"></div>
+  <li class="param-required-">extendedText : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">text : string
-	  <div class="param-description"></div>
+  <li class="param-required-">text : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">sourceDictionary : string
-	  <div class="param-description"></div>
+  <li class="param-required-">sourceDictionary : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">citations : List[Citation]
-	  <div class="param-description"></div>
+  <li class="param-required-">citations : List[Citation]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">labels : List[Label]
-	  <div class="param-description"></div>
+  <li class="param-required-">labels : List[Label]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">score : float
-	  <div class="param-description"></div>
+  <li class="param-required-">score : float
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">exampleUses : List[ExampleUsage]
-	  <div class="param-description"></div>
+  <li class="param-required-">exampleUses : List[ExampleUsage]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">attributionUrl : string
-	  <div class="param-description"></div>
+  <li class="param-required-">attributionUrl : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">seqString : string
-	  <div class="param-description"></div>
+  <li class="param-required-">seqString : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">attributionText : string
-	  <div class="param-description"></div>
+  <li class="param-required-">attributionText : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">relatedWords : List[Related]
-	  <div class="param-description"></div>
+  <li class="param-required-">relatedWords : List[Related]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">sequence : string
-	  <div class="param-description"></div>
+  <li class="param-required-">sequence : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">notes : List[Note]
-	  <div class="param-description"></div>
+  <li class="param-required-">notes : List[Note]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">textProns : List[TextPron]
-	  <div class="param-description"></div>
+  <li class="param-required-">textProns : List[TextPron]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">partOfSpeech : string
-	  <div class="param-description"></div>
+  <li class="param-required-">partOfSpeech : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/DefinitionSearchResults.html b/samples/docs/swagger-static-docs/src/main/webapp/models/DefinitionSearchResults.html
index ea9c6961a86..506a1b74478 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/DefinitionSearchResults.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/DefinitionSearchResults.html
@@ -1,12 +1,12 @@
 <h2>DefinitionSearchResults</h2>
   <ul class="parameter">
-  <li class="param-required-false">results : List[Definition]
-	  <div class="param-description"></div>
+  <li class="param-required-">results : List[Definition]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">totalResults : int
-	  <div class="param-description"></div>
+  <li class="param-required-">totalResults : int
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Example.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Example.html
index 59ab5d8ebb2..f45a46198e9 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Example.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Example.html
@@ -1,62 +1,62 @@
 <h2>Example</h2>
   <ul class="parameter">
-  <li class="param-required-false">id : long
-	  <div class="param-description"></div>
+  <li class="param-required-">id : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">exampleId : long
-	  <div class="param-description"></div>
+  <li class="param-required-">exampleId : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">title : string
-	  <div class="param-description"></div>
+  <li class="param-required-">title : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">text : string
-	  <div class="param-description"></div>
+  <li class="param-required-">text : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">score : ScoredWord
-	  <div class="param-description"></div>
+  <li class="param-required-">score : ScoredWord
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">sentence : Sentence
-	  <div class="param-description"></div>
+  <li class="param-required-">sentence : Sentence
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">provider : ContentProvider
-	  <div class="param-description"></div>
+  <li class="param-required-">provider : ContentProvider
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">year : int
-	  <div class="param-description"></div>
+  <li class="param-required-">year : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">rating : float
-	  <div class="param-description"></div>
+  <li class="param-required-">rating : float
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">documentId : long
-	  <div class="param-description"></div>
+  <li class="param-required-">documentId : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">url : string
-	  <div class="param-description"></div>
+  <li class="param-required-">url : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/ExampleSearchResults.html b/samples/docs/swagger-static-docs/src/main/webapp/models/ExampleSearchResults.html
index 852ad634255..86ba1cc73e1 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/ExampleSearchResults.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/ExampleSearchResults.html
@@ -1,12 +1,12 @@
 <h2>ExampleSearchResults</h2>
   <ul class="parameter">
-  <li class="param-required-false">facets : List[Facet]
-	  <div class="param-description"></div>
+  <li class="param-required-">facets : List[Facet]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">examples : List[Example]
-	  <div class="param-description"></div>
+  <li class="param-required-">examples : List[Example]
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/ExampleUsage.html b/samples/docs/swagger-static-docs/src/main/webapp/models/ExampleUsage.html
index 86ff72aa6b8..6660da43f35 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/ExampleUsage.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/ExampleUsage.html
@@ -1,7 +1,7 @@
 <h2>ExampleUsage</h2>
   <ul class="parameter">
-  <li class="param-required-false">text : string
-	  <div class="param-description"></div>
+  <li class="param-required-">text : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Facet.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Facet.html
index ab7bf33de96..b22e62cb32a 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Facet.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Facet.html
@@ -1,12 +1,12 @@
 <h2>Facet</h2>
   <ul class="parameter">
-  <li class="param-required-false">facetValues : List[FacetValue]
-	  <div class="param-description"></div>
+  <li class="param-required-">facetValues : List[FacetValue]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">name : string
-	  <div class="param-description"></div>
+  <li class="param-required-">name : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/FacetValue.html b/samples/docs/swagger-static-docs/src/main/webapp/models/FacetValue.html
index 98fb091327b..df745ea1ab6 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/FacetValue.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/FacetValue.html
@@ -1,12 +1,12 @@
 <h2>FacetValue</h2>
   <ul class="parameter">
-  <li class="param-required-false">count : long
-	  <div class="param-description"></div>
+  <li class="param-required-">count : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">value : string
-	  <div class="param-description"></div>
+  <li class="param-required-">value : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Frequency.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Frequency.html
index c987902b73b..c0240cdaa86 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Frequency.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Frequency.html
@@ -1,12 +1,12 @@
 <h2>Frequency</h2>
   <ul class="parameter">
-  <li class="param-required-false">count : long
-	  <div class="param-description"></div>
+  <li class="param-required-">count : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">year : int
-	  <div class="param-description"></div>
+  <li class="param-required-">year : int
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/FrequencySummary.html b/samples/docs/swagger-static-docs/src/main/webapp/models/FrequencySummary.html
index 10b3aee5a51..f64d73b9cad 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/FrequencySummary.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/FrequencySummary.html
@@ -1,27 +1,27 @@
 <h2>FrequencySummary</h2>
   <ul class="parameter">
-  <li class="param-required-false">unknownYearCount : int
-	  <div class="param-description"></div>
+  <li class="param-required-">unknownYearCount : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">totalCount : long
-	  <div class="param-description"></div>
+  <li class="param-required-">totalCount : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">frequencyString : string
-	  <div class="param-description"></div>
+  <li class="param-required-">frequencyString : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">frequency : List[Frequency]
-	  <div class="param-description"></div>
+  <li class="param-required-">frequency : List[Frequency]
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Label.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Label.html
index 4aec69d3aab..f5e17e4c1a3 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Label.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Label.html
@@ -1,12 +1,12 @@
 <h2>Label</h2>
   <ul class="parameter">
-  <li class="param-required-false">text : string
-	  <div class="param-description"></div>
+  <li class="param-required-">text : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">type : string
-	  <div class="param-description"></div>
+  <li class="param-required-">type : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Note.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Note.html
index 50250763db7..413cffcff7d 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Note.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Note.html
@@ -1,22 +1,22 @@
 <h2>Note</h2>
   <ul class="parameter">
-  <li class="param-required-false">noteType : string
-	  <div class="param-description"></div>
+  <li class="param-required-">noteType : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">appliesTo : List[string]
-	  <div class="param-description"></div>
+  <li class="param-required-">appliesTo : List[string]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">value : string
-	  <div class="param-description"></div>
+  <li class="param-required-">value : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">pos : int
-	  <div class="param-description"></div>
+  <li class="param-required-">pos : int
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Related.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Related.html
index 506fae62732..e25327a5069 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Related.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Related.html
@@ -1,37 +1,37 @@
 <h2>Related</h2>
   <ul class="parameter">
-  <li class="param-required-false">label1 : string
-	  <div class="param-description"></div>
+  <li class="param-required-">label1 : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">relationshipType : string
-	  <div class="param-description"></div>
+  <li class="param-required-">relationshipType : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">label2 : string
-	  <div class="param-description"></div>
+  <li class="param-required-">label2 : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">label3 : string
-	  <div class="param-description"></div>
+  <li class="param-required-">label3 : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">words : List[string]
-	  <div class="param-description"></div>
+  <li class="param-required-">words : List[string]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">gram : string
-	  <div class="param-description"></div>
+  <li class="param-required-">gram : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">label4 : string
-	  <div class="param-description"></div>
+  <li class="param-required-">label4 : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/ScoredWord.html b/samples/docs/swagger-static-docs/src/main/webapp/models/ScoredWord.html
index ba573de2b46..04204edadbe 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/ScoredWord.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/ScoredWord.html
@@ -1,57 +1,57 @@
 <h2>ScoredWord</h2>
   <ul class="parameter">
-  <li class="param-required-false">position : int
-	  <div class="param-description"></div>
+  <li class="param-required-">position : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">id : long
-	  <div class="param-description"></div>
+  <li class="param-required-">id : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">docTermCount : int
-	  <div class="param-description"></div>
+  <li class="param-required-">docTermCount : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">lemma : string
-	  <div class="param-description"></div>
+  <li class="param-required-">lemma : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">wordType : string
-	  <div class="param-description"></div>
+  <li class="param-required-">wordType : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">score : float
-	  <div class="param-description"></div>
+  <li class="param-required-">score : float
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">sentenceId : long
-	  <div class="param-description"></div>
+  <li class="param-required-">sentenceId : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">stopword : boolean
-	  <div class="param-description"></div>
+  <li class="param-required-">stopword : boolean
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">baseWordScore : double
-	  <div class="param-description"></div>
+  <li class="param-required-">baseWordScore : double
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">partOfSpeech : string
-	  <div class="param-description"></div>
+  <li class="param-required-">partOfSpeech : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/ScrabbleScoreResult.html b/samples/docs/swagger-static-docs/src/main/webapp/models/ScrabbleScoreResult.html
index c64e8d6b43a..e5c9ccc36fe 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/ScrabbleScoreResult.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/ScrabbleScoreResult.html
@@ -1,7 +1,7 @@
 <h2>ScrabbleScoreResult</h2>
   <ul class="parameter">
-  <li class="param-required-false">value : int
-	  <div class="param-description"></div>
+  <li class="param-required-">value : int
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Sentence.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Sentence.html
index 029f07fccc3..e99061bab75 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Sentence.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Sentence.html
@@ -1,32 +1,32 @@
 <h2>Sentence</h2>
   <ul class="parameter">
-  <li class="param-required-false">hasScoredWords : boolean
-	  <div class="param-description"></div>
+  <li class="param-required-">hasScoredWords : boolean
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">id : long
-	  <div class="param-description"></div>
+  <li class="param-required-">id : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">scoredWords : List[ScoredWord]
-	  <div class="param-description"></div>
+  <li class="param-required-">scoredWords : List[ScoredWord]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">display : string
-	  <div class="param-description"></div>
+  <li class="param-required-">display : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">rating : int
-	  <div class="param-description"></div>
+  <li class="param-required-">rating : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">documentMetadataId : long
-	  <div class="param-description"></div>
+  <li class="param-required-">documentMetadataId : long
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/SimpleDefinition.html b/samples/docs/swagger-static-docs/src/main/webapp/models/SimpleDefinition.html
index 40507c65bc9..43648e076a9 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/SimpleDefinition.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/SimpleDefinition.html
@@ -1,22 +1,22 @@
 <h2>SimpleDefinition</h2>
   <ul class="parameter">
-  <li class="param-required-false">text : string
-	  <div class="param-description"></div>
+  <li class="param-required-">text : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">source : string
-	  <div class="param-description"></div>
+  <li class="param-required-">source : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">note : string
-	  <div class="param-description"></div>
+  <li class="param-required-">note : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">partOfSpeech : string
-	  <div class="param-description"></div>
+  <li class="param-required-">partOfSpeech : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/SimpleExample.html b/samples/docs/swagger-static-docs/src/main/webapp/models/SimpleExample.html
index 0f84a12b72d..247e58279de 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/SimpleExample.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/SimpleExample.html
@@ -1,22 +1,22 @@
 <h2>SimpleExample</h2>
   <ul class="parameter">
-  <li class="param-required-false">id : long
-	  <div class="param-description"></div>
+  <li class="param-required-">id : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">title : string
-	  <div class="param-description"></div>
+  <li class="param-required-">title : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">text : string
-	  <div class="param-description"></div>
+  <li class="param-required-">text : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">url : string
-	  <div class="param-description"></div>
+  <li class="param-required-">url : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/StringValue.html b/samples/docs/swagger-static-docs/src/main/webapp/models/StringValue.html
index 8bdf3cd6638..4dc863dde63 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/StringValue.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/StringValue.html
@@ -1,7 +1,7 @@
 <h2>StringValue</h2>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/Syllable.html b/samples/docs/swagger-static-docs/src/main/webapp/models/Syllable.html
index 873a5acab28..78c7ecd6e13 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/Syllable.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/Syllable.html
@@ -1,17 +1,17 @@
 <h2>Syllable</h2>
   <ul class="parameter">
-  <li class="param-required-false">text : string
-	  <div class="param-description"></div>
+  <li class="param-required-">text : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">seq : int
-	  <div class="param-description"></div>
+  <li class="param-required-">seq : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">type : string
-	  <div class="param-description"></div>
+  <li class="param-required-">type : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/TextPron.html b/samples/docs/swagger-static-docs/src/main/webapp/models/TextPron.html
index 2bbe48da208..d325914e95a 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/TextPron.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/TextPron.html
@@ -1,17 +1,17 @@
 <h2>TextPron</h2>
   <ul class="parameter">
-  <li class="param-required-false">raw : string
-	  <div class="param-description"></div>
+  <li class="param-required-">raw : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">seq : int
-	  <div class="param-description"></div>
+  <li class="param-required-">seq : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">rawType : string
-	  <div class="param-description"></div>
+  <li class="param-required-">rawType : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/User.html b/samples/docs/swagger-static-docs/src/main/webapp/models/User.html
index abadf4eb671..763250d7fc2 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/User.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/User.html
@@ -1,42 +1,42 @@
 <h2>User</h2>
   <ul class="parameter">
-  <li class="param-required-false">id : long
-	  <div class="param-description"></div>
+  <li class="param-required-">id : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">username : string
-	  <div class="param-description"></div>
+  <li class="param-required-">username : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">email : string
-	  <div class="param-description"></div>
+  <li class="param-required-">email : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">status : int
-	  <div class="param-description"></div>
+  <li class="param-required-">status : int
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">faceBookId : string
-	  <div class="param-description"></div>
+  <li class="param-required-">faceBookId : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">userName : string
-	  <div class="param-description"></div>
+  <li class="param-required-">userName : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">displayName : string
-	  <div class="param-description"></div>
+  <li class="param-required-">displayName : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">password : string
-	  <div class="param-description"></div>
+  <li class="param-required-">password : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/WordList.html b/samples/docs/swagger-static-docs/src/main/webapp/models/WordList.html
index eb4b36d2adf..c1a07afc90d 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/WordList.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/WordList.html
@@ -1,57 +1,57 @@
 <h2>WordList</h2>
   <ul class="parameter">
-  <li class="param-required-false">id : long
-	  <div class="param-description"></div>
+  <li class="param-required-">id : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">permalink : string
-	  <div class="param-description"></div>
+  <li class="param-required-">permalink : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">name : string
-	  <div class="param-description"></div>
+  <li class="param-required-">name : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">createdAt : Date
-	  <div class="param-description"></div>
+  <li class="param-required-">createdAt : Date
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">updatedAt : Date
-	  <div class="param-description"></div>
+  <li class="param-required-">updatedAt : Date
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">lastActivityAt : Date
-	  <div class="param-description"></div>
+  <li class="param-required-">lastActivityAt : Date
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">username : string
-	  <div class="param-description"></div>
+  <li class="param-required-">username : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">userId : long
-	  <div class="param-description"></div>
+  <li class="param-required-">userId : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">description : string
-	  <div class="param-description"></div>
+  <li class="param-required-">description : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">numberWordsInList : long
-	  <div class="param-description"></div>
+  <li class="param-required-">numberWordsInList : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">type : string
-	  <div class="param-description"></div>
+  <li class="param-required-">type : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/WordListWord.html b/samples/docs/swagger-static-docs/src/main/webapp/models/WordListWord.html
index e26a788adc1..6bf15368f69 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/WordListWord.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/WordListWord.html
@@ -1,37 +1,37 @@
 <h2>WordListWord</h2>
   <ul class="parameter">
   <li class="param-required-true">id : long
-	  <div class="param-description"></div>
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">username : string
-	  <div class="param-description"></div>
+  <li class="param-required-">username : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">userId : long
-	  <div class="param-description"></div>
+  <li class="param-required-">userId : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">createdAt : Date
-	  <div class="param-description"></div>
+  <li class="param-required-">createdAt : Date
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">numberCommentsOnWord : long
-	  <div class="param-description"></div>
+  <li class="param-required-">numberCommentsOnWord : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">numberLists : long
-	  <div class="param-description"></div>
+  <li class="param-required-">numberLists : long
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/WordObject.html b/samples/docs/swagger-static-docs/src/main/webapp/models/WordObject.html
index 680e45b0ab8..59659d8c2c6 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/WordObject.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/WordObject.html
@@ -1,32 +1,32 @@
 <h2>WordObject</h2>
   <ul class="parameter">
   <li class="param-required-true">id : long
-	  <div class="param-description"></div>
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">originalWord : string
-	  <div class="param-description"></div>
+  <li class="param-required-">originalWord : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">suggestions : List[string]
-	  <div class="param-description"></div>
+  <li class="param-required-">suggestions : List[string]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">canonicalForm : string
-	  <div class="param-description"></div>
+  <li class="param-required-">canonicalForm : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">vulgar : string
-	  <div class="param-description"></div>
+  <li class="param-required-">vulgar : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/WordOfTheDay.html b/samples/docs/swagger-static-docs/src/main/webapp/models/WordOfTheDay.html
index 094aae75419..135648d94e2 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/WordOfTheDay.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/WordOfTheDay.html
@@ -1,62 +1,62 @@
 <h2>WordOfTheDay</h2>
   <ul class="parameter">
   <li class="param-required-true">id : long
-	  <div class="param-description"></div>
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">parentId : string
-	  <div class="param-description"></div>
+  <li class="param-required-">parentId : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">category : string
-	  <div class="param-description"></div>
+  <li class="param-required-">category : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">createdBy : string
-	  <div class="param-description"></div>
+  <li class="param-required-">createdBy : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">createdAt : Date
-	  <div class="param-description"></div>
+  <li class="param-required-">createdAt : Date
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">contentProvider : ContentProvider
-	  <div class="param-description"></div>
+  <li class="param-required-">contentProvider : ContentProvider
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">htmlExtra : string
-	  <div class="param-description"></div>
+  <li class="param-required-">htmlExtra : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">definitions : List[SimpleDefinition]
-	  <div class="param-description"></div>
+  <li class="param-required-">definitions : List[SimpleDefinition]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">examples : List[SimpleExample]
-	  <div class="param-description"></div>
+  <li class="param-required-">examples : List[SimpleExample]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">note : string
-	  <div class="param-description"></div>
+  <li class="param-required-">note : string
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">publishDate : Date
-	  <div class="param-description"></div>
+  <li class="param-required-">publishDate : Date
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/WordSearchResult.html b/samples/docs/swagger-static-docs/src/main/webapp/models/WordSearchResult.html
index 14a5e376be8..1e0574058ea 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/WordSearchResult.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/WordSearchResult.html
@@ -1,17 +1,17 @@
 <h2>WordSearchResult</h2>
   <ul class="parameter">
-  <li class="param-required-false">count : long
-	  <div class="param-description"></div>
+  <li class="param-required-">count : long
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">lexicality : double
-	  <div class="param-description"></div>
+  <li class="param-required-">lexicality : double
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">word : string
-	  <div class="param-description"></div>
+  <li class="param-required-">word : string
+	  <br/>{description}}
   </li>
 </ul>
   
diff --git a/samples/docs/swagger-static-docs/src/main/webapp/models/WordSearchResults.html b/samples/docs/swagger-static-docs/src/main/webapp/models/WordSearchResults.html
index 14e7fe44ce6..8dbb872fefa 100644
--- a/samples/docs/swagger-static-docs/src/main/webapp/models/WordSearchResults.html
+++ b/samples/docs/swagger-static-docs/src/main/webapp/models/WordSearchResults.html
@@ -1,12 +1,12 @@
 <h2>WordSearchResults</h2>
   <ul class="parameter">
-  <li class="param-required-false">searchResults : List[WordSearchResult]
-	  <div class="param-description"></div>
+  <li class="param-required-">searchResults : List[WordSearchResult]
+	  <br/>{description}}
   </li>
 </ul>
   <ul class="parameter">
-  <li class="param-required-false">totalResults : int
-	  <div class="param-description"></div>
+  <li class="param-required-">totalResults : int
+	  <br/>{description}}
   </li>
 </ul>