* paybas/ticket/12377:
[ticket/12377] Forgot to change the INCLUDEs
[ticket/12377] Renamed template files to navbar_xxx
[ticket/12377] Moved notifications to new template
[ticket/12377] Forgot empty line at the end
[ticket/12377] Move navbar(s) to new template file