Merge pull request #116 from tomtom84/master

fixes in diabook-derivates

diff --combined view/theme/diabook/nav.tpl
index 174312d2d770893299c9177adb19cd90d37c8326,5776b6cf753609a46b9ce314676eb8fb0a3e4468..8b32ebe6caf5f7c93e8a44c307530ec05832498c
--- 1/view/theme/diabook/nav.tpl
--- 2/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@@ -26,6 -26,7 +26,7 @@@
                                        <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
                                </ul>
                        </li>   
+ 
                        {{ endif }}
                        
                        {{ if $nav.messages }}
@@@ -145,15 -146,12 +146,16 @@@
  
  
  
+ 
  <ul id="nav-notifications-template" style="display:none;" rel="template">
        <li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
  </ul>
  
  
 +<ul id="nav-notifications-template" style="display:none;" rel="template">
 +      <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
 +</ul>
 +
  
  {#