Fixed NullPointerException
Merge pull request #172 from blasv/profile2

Fixed NullPointerException
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/profile/MenuItemsFragment.java