Signed-off-by: olive <olive>
Merge branch 'master' of git@github.com:dragon17951/xdxoxuxnxixux.git

Conflicts:
	.project
	AndroidManifest.xml
	project.properties
	src/com/jday/majiang/model/Assets.java

Signed-off-by: olive <olive>