Fixed Type Satelite => Satellite
Merge branch 'parse_utilization_test' of https://github.com/mhotan/DineOn
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/UserInfo.java
	DineOnLibrary/src/uw/cse/dineon/library/util/ParseUtil.java
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/DineOnRestaurantActivity.java
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/RestaurantSatelite.java