Messages is working
Merge github.com:cojalvo/CampusInProject

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