update
signin/up integreation complete
adding shared debug.keystore
Map interface map part did not work
Fix API issueg
ready to merge
Merge pull request #29 from tckeelin/763_CustomMapInterface_XZ

763 custom map interface xz
update to develop
ready for review
Fix Element show problem
Merge pull request #32 from tckeelin/763_CustomMapInterface_XZ

Fix Element show problem
checking in
Merge branch '750-integrate-new-ui-tk' into develop

Conflicts:
	clients/Android/RideShare/gen/com/asu/rideshare/R.java
	clients/Android/RideShare/res/layout/activity_home.xml
	clients/Android/RideShare/res/values/strings.xml
	clients/Android/RideShare/src/com/asu/rideshare/app/HomeActivity.java
	clients/Android/RideShare/src/com/asu/rideshare/proxy/RideShareProxy.java
	clients/Android/RideShare/src/com/asu/rideshare/proxy/SyncContactsTask.java
	services/NotificationService/ntfs-1.0.jar
	services/utils/DataManager/src/com/asu/rideshare/dm/EndpointDataManager.java
moving notifications to utils
refactoring notifications
backend refactor
Merge pull request #33 from tckeelin/749-im-tk

749 im tk
adding IM and IM_Search
Started adding contact list classes that Kellie made so that I can integrate my code