listview still repeating values
getview position hack
Merge remote-tracking branch 'origin/becktk/adapterrefactor'

Conflicts:
	Application/app/src/main/java/edu/vanderbilt/cs285/secure_sms/ConversationActivity.java