layout dialog
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
	AndroidManifest.xml
	res/values/strings.xml
	src/info/ishared/android/chakaifang/MainActivity.java