Merge branch 'navbar'

# Conflicts:
#	src/components/app.html
#	src/components/map/map.ts
#	src/components/search/search.ts

diff --cc src/components/app.html
index 9ef7c51db1707aa634954fc54966d39be1d104a3,bf5712727986862537a11e064238f19a9ac8b48d..e5243605971f231cf547fd558ead796ccb6ffb23
--- 1/src/components/app.html
--- 2/src/components/app.html
+++ b/src/components/app.html
@@@ -1,12 -1,6 +1,6 @@@
  <div class="container">
-     <div class="nav">
-         Navbar
-         <mou-search (newsearch)="map.update($event)"></mou-search>
-         <mou-filter></mou-filter>
-     </div>
- 
+     <mou-navbar></mou-navbar>
 -    <mou-map></mou-map>
 +    <mou-map #map></mou-map>
- 
  </div>
  
  

diff --cc src/components/search/search.ts
index 2c2a6aed595c1c8f9f53d8187861b3f8ae5e2bff,95d6fcb4a564e2f903a7814c00c168c813aea3de..98e69aa4a7d65a4d5219d0d0878d8e035cba4c85
--- 1/src/components/search/search.ts
--- 2/src/components/search/search.ts
+++ b/src/components/search/search.ts
@@@ -9,17 -8,24 +9,25 @@@ import {LiveSearch} from "./livesearch"
      styleUrls: ['./components/search/search.css']
  })
  export class Search {
-     orgunits:Array<any> = [];
-     loading:boolean = false;
+     orgunits: Array<any> = [];
+     loading: boolean = false;
  
 -    getMoreInfo(orgunit){
 -        console.log(orgunit.id);
 +    constructor() {
 +        this.newsearch = new EventEmitter();
++        this.visible = true;
+ 
      }
  
 -    //tester pil oppned
 -
 -    constructor() {
 -        this.visible = true;
 +    getMoreInfo(orgunit) {
 +        this.newsearch.next(orgunit.id);
      }
  
++    //tester pil oppned
++
+     toggle() {
+         this.visible = !this.visible;
+     }
+ 
  }