add
Merge branch 'master' into devel

Conflicts:
	src/com/jungbu/wedding_02/MainActivity.java