tests for profile
Merge branch 'master' of https://github.com/blasv/DineOn

Conflicts:
	DineOnUserApplication/tests/src/uw/cse/dineon/user/login/test/UserLoginActivityTest.java
Fixed bug with the menu on Profile Activity.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Change to Profile/DineOnUser activities that checked for null
DineOnUsers.
Merge branch 'master' of https://github.com/blasv/DineOn
Merge pull request #262 from espeo196/master

Fixed bug with the menu in Profile Activity.
Merge branch 'master' of https://github.com/blasv/DineOn
Got rid of More Info button on Restaurant Selection and the Bill button
on the Pay Bill screen.
Merge pull request #266 from glee23/master

Moved the delete button to the right
Updates to Image Cache.  Improved Logic checks.  DineOnImages are now
the first class to use pointers.  Therefore only the restaurant has the
ability to explicitly save an image.  DineOnImages are packed
(packObject) as a pointer isntead of actual object
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev
Merge remote-tracking branch 'upstream/master'
See commit messages. Fixed some styles and deleted some TODOs that were
hanging around.
Merge pull request #267 from mhotan/phase_4_dev

Updates to Image Cache
Merge remote-tracking branch 'upstream/master'
Merge pull request #268 from espeo196/master

A few bug fixes and such.
Tests. made it so it actually hits the menu button.
Merge branch 'master' of https://github.com/blasv/DineOn