bug fix
removed HEAD merge in strings.xml
wrote unit tests for endpoint registration
successfully added users to database
Merge pull request #37 from tckeelin/850-test-add-users-to-db-SB

successfully added users to database
Merge pull request #35 from tckeelin/851-test-endpoints-registration-SB

wrote unit tests for endpoint registration
contact stuff
Merge pull request #38 from tckeelin/749-im-tk

contact stuff
Merge branch 'develop' of https://github.com/tckeelin/RideShare into 683-contact-list-kw
adding contac-list peer programing session

D
dd
Conflicts:
	clients/Android/RideShare/gen/com/asu/rideshare/R.java
	clients/Android/RideShare/res/layout/activity_instant_messaging.xml
	services/EndpointService/.classpath