modified
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/kr/imus/android/demo/MainActivity.java