0225
goodmorn
kyobum
M
erge branch 'master' of https://github.com/blacky512/smart_morning_call

Conflicts:
	client/.metadata/.log
	client/.metadata/.mylyn/.tasks.xml.zip
	client/.metadata/.mylyn/tasks.xml.zip
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/SmartMorningCall/.indexes/a0/d6/history.index
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/SmartMorningCall/.indexes/a0/d6/properties.index
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/SmartMorningCall/.indexes/e4/3/48/76/history.index
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/SmartMorningCall/.indexes/e4/3/48/b0/history.index
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/SmartMorningCall/.indexes/e4/3/48/ba/history.index
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/SmartMorningCall/.indexes/e4/3/48/history.index
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/SmartMorningCall/.indexes/history.index
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/SmartMorningCall/.indexes/properties.index
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/SmartMorningCall/.markers
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/voicetestUDP/.markers
	client/.metadata/.plugins/org.eclipse.core.resources/.projects/voicetestUDP/org.eclipse.jdt.core/state.dat
	client/.metadata/.plugins/org.eclipse.core.resources/.root/17.tree
	client/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	client/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	client/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	client/.metadata/.plugins/org.eclipse.jdt.core/3377066645.index
	client/.metadata/.plugins/org.eclipse.jdt.core/3408937549.index
	client/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	client/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	client/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	client/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	client/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	client/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/SmartMorningCall/2013/2/9/refactorings.history
	client/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/SmartMorningCall/2013/2/9/refactorings.index
	client/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	client/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	client/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	client/SmartMorningCall/bin/SmartMorningCall.apk
	client/SmartMorningCall/bin/classes.dex
	client/SmartMorningCall/bin/classes/whitepaper/smcall/AlarmReceiverActivity$1.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/AlarmReceiverActivity.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/LoginActivity$1.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/LoginActivity.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/MainActivity.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/MorningCallActivity.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/R$id.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/R$layout.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/R$menu.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/R$string.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/R$style.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/fragment/DaySelect$1.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/fragment/DaySelect.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/fragment/MorningCall.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/fragment/RandomCallFrg$1.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/fragment/RandomCallFrg.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/fragment/VoicechattingFrag$1.class
	client/SmartMorningCall/bin/classes/whitepaper/smcall/fragment/VoicechattingFrag.class
	client/SmartMorningCall/bin/resources.ap_
	client/SmartMorningCall/gen/whitepaper/smcall/R.java