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

Conflicts:
	DineOnUserApplication/tests/src/uw/cse/dineon/user/login/test/UserLoginActivityTest.java
Merge branch 'master' of https://github.com/blasv/DineOn
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 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
removed unused imports
Merge pull request #269 from jordanmcnea22/master

Read commit messeges
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnUserApplication/res/values/strings.xml