refactors ConversationAdapter
Merge branch 'master' into brayjd/getViewDebug

Conflicts:
	Application/app/src/main/java/edu/vanderbilt/cs285/secure_sms/ConversationAdapter.java
Merge branch 'brayjd/getViewDebug'