미팅리스트 업데이트
Merge branch 'master' of https://github.com/meetingari/meetingari

Conflicts:
	development/android_client/.project
	development/android_client/.settings/org.eclipse.jdt.core.prefs
	development/android_client/AndroidManifest.xml
	development/android_client/bin/AndroidManifest.xml
	development/android_client/proguard-project.txt
	development/android_client/project.properties
	development/android_client/res/layout/activity_launch.xml
	development/android_client/res/menu/launch.xml
	development/android_client/res/values-sw600dp/dimens.xml
	development/android_client/res/values-sw720dp-land/dimens.xml
	development/android_client/res/values-v11/styles.xml
	development/android_client/res/values-v14/styles.xml
	development/android_client/res/values/dimens.xml
	development/android_client/res/values/strings.xml
	development/android_client/res/values/styles.xml