src update 20130510_1546
Merge https://github.com/kimbushik/android_study

Conflicts:
	javaTest/test.txt