something
Merge branch 'master' of https://github.com/gaominghui/Test_20140805

Conflicts:
	bin/com/ming/actions/agent_actions.class
	bin/com/ming/actions/user_actions.class
	bin/com/ming/moniDuihua.class
	bin/com/ming/slots/Slots.class
	src/com/ming/actions/agent_actions.java
	src/com/ming/actions/user_actions.java
	src/com/ming/moniDuihua.java
	src/com/ming/slots/Slots.java
	src/sentences_inform.xml