update the get friends method
Merge branch 'master' of https://github.com/cojalvo/CampusInProject

Conflicts:
	GoogleMapProject/src/il/ac/shenkar/cadan/Main.java
	GoogleMapProject/src/il/ac/shenkar/in/bl/Controller.java