Minor style changes.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Commit to allow merge
Revert "Commit to allow merge"

This reverts commit 5ffca43fe74c7d99859938156a59f137cbd18df7.
Merge remote-tracking branch 'upstream/master'
Initial Parcel and pack/unpack functionality
Parcel and Parse Implementations.
Update to Class Loaders
Merge pull request #52 from espeo196/master

Initial Parcel and Parse Implementation
Test changes.
Update to onSave/RestoreInstanceState with Parcelable interface.
Fixed Everything so that it works
Merge pull request #55 from espeo196/master

New version of onSaved/RestoreInstanceState using Parcelable.
Mikes first Merge, Hey that wasn't so bad
Merge pull request #56 from mhotan/UI_Phase2

Temporary Fix
Merge branch 'UI_Phase2' of https://github.com/blasv/DineOn

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/DineOnUserActivity.java