講演者表示しました.
Merge branch 'master' of https://github.com/joityui/abc

Conflicts:
	ABC2013s/src/net/joityui/android/abc2013s/provider/ABCProvider.java