fix
fix bug
fix bug
test
ignore file
remove
remove
Merge branch '0.49' of https://github.com/qii/weiciyuan into 0.49

Conflicts:
	.gitignore
	project.properties
*2013-10-21