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

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	bin/com/ming/Strategy.class
	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
	bin/com/ming/util/flag_info.class
	bin/sentences_Greet.xml
	bin/sentences_bye.xml
	bin/sentences_confirm.xml
	bin/sentences_inform.xml
	bin/sentences_request.xml
	bin/sentences_select.xml
	src/com/ming/Strategy.java
	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/com/ming/slots/price_detail.java
	src/com/ming/util/flag_info.java
	src/sentences_Greet.xml
	src/sentences_bye.xml
	src/sentences_confirm.xml
	src/sentences_inform.xml
	src/sentences_request.xml
	src/sentences_select.xml