RestaurantSelection callbacks factored
callback test for selectionactivity
Updated tests for callback access
Test merge fixing
Updated CreateNewAccount
Commented out line that unsubscribes push service
Comment out unsubscribe Push Service
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnUserApplication/res/values/strings.xml
Merge pull request #270 from zachr81/master

Factored callback creation into methods to allow testing
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev
Merge pull request #271 from mhotan/phase_4_dev

Unsubscribe Push service is now commented out