Commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/restaurantselection/RestaurantInfoFragment.java
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Initial MenuItem adding
test toasts
Merge branch 'master' of https://github.com/blasv/DineOn
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/MenuItem.java
	DineOnLibrary/src/uw/cse/dineon/library/RestaurantInfo.java
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/profile/MenuItemsFragment.java
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/profile/ProfileActivity.java
	DineOnUserApplication/src/uw/cse/dineon/user/login/CreateNewAccountActivity.java
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/blasv/DineOn
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/MenuItem.java
Merge branch 'master' of https://github.com/blasv/DineOn
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/profile/MenuItemsFragment.java
Merge branch 'master' of https://github.com/blasv/DineOn
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/profile/MenuItemsFragment.java
all got -o'ed
Merge branch 'master' of https://github.com/blasv/DineOn