2014/09/06 05:22 PM
2014/09/06 09:56PM
2014/09/07 05:53PM
2014/09/07 05:58PM
Merge branch 'protocolNtransaction' of
https://github.com/Poturns/Blink.git into protocolNtransaction

Conflicts:
	BlinkLibrary/res/layout/list_recent.xml
	BlinkLibrary/src/kr/poturns/blink/db/JsonManager.java
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/MainActivity$1.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/MainActivity.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R$array.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R$dimen.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R$drawable.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R$id.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R$layout.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R$menu.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R$string.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R$style.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R$xml.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/R.class
	Demo/ServiceTestApp/bin/classes/com/example/servicetestapp/TestArchive.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R$array.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R$dimen.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R$drawable.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R$id.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R$layout.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R$menu.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R$string.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R$style.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R$xml.class
	Demo/ServiceTestApp/bin/classes/kr/poturns/blink/R.class