Merge branch 'master' of https://github.com/privat/nit into nitdoc_merge

diff --cc share/ni_nitdoc/styles/main.css
index 5be5003,4dc4cdc..2715407
--- 1/share/ni_nitdoc/styles/main.css
--- 2/share/ni_nitdoc/styles/main.css
+++ b/share/ni_nitdoc/styles/main.css
@@@ -356,9 -357,9 +356,9 @@@ article .info .code 
  }\r
  \r
  .content .concern-doc {\r
--      border-top: 3px dotted #CCC;\r
++      border-bottom: 1px dashed #CCC;\r
        padding: 5px 0;\r
--      color: #999;\r
++      color: #6C6C6C;\r
  }\r
  \r
  .content section.concerns {\r
@@@ -390,9 -390,13 +390,9 @@@
  }\r
  \r
  .content section.methods h3.concern-toplevel {\r
--      border-top: 3px dotted #CCC;\r
--      padding-top: 0.83em;\r
--      color: #999;\r
 -}\r
 -\r
 -.noComment {\r
 -      background-color: transparent;\r
++      padding: 10px;\r
++      border: 1px solid #ccc;\r
++      color: #6C6C6C;\r
  }\r
  \r
  .show-code {\r
@@@ -508,3 -512,55 +508,54 @@@ nav h3 a.fold 
        background-color: #E0E0E0;\r
  }\r
  \r
+ /* New comments style */\r
+ \r
+ .content .nitdoc {\r
+   background: #F7F7F7;\r
+   padding: 5px;\r
+   color: black;\r
+   overflow: auto;\r
+ }\r
+ \r
+ .content .nitdoc pre {\r
+   background: #EEE;\r
 -  border-radius: 8px;\r
+ }\r
+ \r
+ .content .nitdoc code {\r
+   background: #DDD;\r
+   padding: 0 1px;\r
 -  border-radius: 5px;\r
+ }\r
+ \r
+ .rawcode {\r
+ }\r
+ \r
+ .nitcode a { color: inherit; text-decoration: inherit; } /* hide links */\r
+ .nitcode a:hover { text-decoration: underline; } /* underline links */\r
+ .nitcode span[title]:hover { text-decoration: underline; } /* underline titles */\r
+ /* lexical raw tokens. independent of usage or semantic: */\r
+ .nitcode .nc_c { color: gray; font-style: italic; } /* comment */\r
+ .nitcode .nc_d { color: #3D8127; font-style: italic; } /* documentation comments */\r
+ .nitcode .nc_k { font-weight: bold; } /* keyword */\r
+ .nitcode .nc_o {} /* operator */\r
+ .nitcode .nc_i {} /* standard identifier */\r
+ .nitcode .nc_t { color: #445588; font-weight: bold; } /* type/class identifier */\r
+ .nitcode .nc_a { color: #445588; font-style: italic; } /* old style attribute identifier */\r
+ .nitcode .nc_l { color: #009999; } /* char and number literal */\r
+ .nitcode .nc_s { color: #8F1546; } /* string literal */\r
+ /* syntactic token usage. added because of their position in the AST */\r
+ .nitcode .nc_ast { color: blue; } /* assert label */\r
+ .nitcode .nc_la { color: blue; } /* break/continue label */\r
+ .nitcode .nc_m { color: #445588; } /* module name */\r
+ /* syntactic groups */\r
+ .nitcode .nc_def { font-weight: bold; color: blue; } /* name used in a definition */\r
 -  .nitcode .nc_def.nc_a { color: blue; } /* name used in a attribute definition */\r
 -  .nitcode .nc_def.nc_t { color: blue; } /* name used in a class or vt definition */\r
++.nitcode .nc_def.nc_a { color: blue; } /* name used in a attribute definition */\r
++.nitcode .nc_def.nc_t { color: blue; } /* name used in a class or vt definition */\r
+ .nitcode .nc_ss { color: #9E6BEB; } /* superstrings */\r
+ .nitcode .nc_cdef {} /* A whole class definition */\r
+ .nitcode .nc_pdef {} /* A whole property definition */\r
+ /* semantic token usage */\r
+ .nitcode .nc_v { font-style: italic; } /* local variable or parameter */\r
+ .nitcode .nc_vt { font-style: italic; } /* virtual type or formal type */\r
+ \r
+ .nitcode .nc_error { border: 1px red solid;} /* not used */\r
++\r