adding IM
label added to strings.xml
im stuff
Merge branch '751_InstantMessaging_Priscilla' into develop

Conflicts:
	clients/Android/RideShare/gen/com/asu/rideshare/R.java
	clients/Android/RideShare/res/layout/activity_instant_messaging.xml
	clients/Android/RideShare/res/values/strings.xml
fixing merge issues
fixing merge issues
bug fix
removed HEAD merge in strings.xml
added mock data, still needs to be tested