chat pretty version
something removed
commiting compat
Merge branch 'master' of https://github.com/dokwon/mingle-android-client

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.indexes/50/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.indexes/7/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/50/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.indexes/7/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/50/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/7/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/e4/81/96/72/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/mingle/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.indexes/50/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.indexes/7/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/swipelistview/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1000389100.index
	.metadata/.plugins/org.eclipse.jdt.core/2277131192.index
	.metadata/.plugins/org.eclipse.jdt.core/848856923.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/10.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/11.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/12.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/13.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/14.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/15.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/16.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/17.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/18.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/9.png
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	mingle-android-client-master/appcompat_v7/bin/android-support-v7-appcompat.jar
	mingle-android-client-master/google-play-services_lib/bin/google-play-services_lib.jar
	mingle-android-client-master/mingle/bin/classes.dex
	mingle-android-client-master/mingle/bin/dexedLibs/android-support-v7-appcompat-2733a60f68888bb8e3ec548326ba4db7.jar
	mingle-android-client-master/mingle/bin/dexedLibs/swipelistview-12072adfeb8f753b47ff0d04110d0d53.jar
	mingle-android-client-master/mingle/bin/mingle.apk
	mingle-android-client-master/mingle/bin/resources.ap_
	mingle-android-client-master/mingle/gen/.gitignore
	mingle-android-client-master/mingle/src/com/example/mingle/HttpHelper.java
	mingle-android-client-master/swipelistview/bin/swipelistview.jar
working merge copy