Merge branch 'niklas_dev2' of Software_Engineering_I/greenvironment-frontend into master

src/app/components/social/friends/friends.component.ts

@@ -11,7 +11,7 @@ import { Router } from '@angular/router';
 })
 export class FriendsComponent implements OnInit {
 
-  friendIDs: number[] = [1,2,3,4,5,6]
+  friendIDs: number[] = [29, 27, 30, 31]
   friends = new Array<FriendInfo>() //= ["Friend 1", "Friend 2", "Friend 3", "Friend 4", "Friend 5", "Friend 6"]
 
   constructor(private data: DatasharingService, private http: Http, private router: Router) { }