local commit
Merge branch 'master' of https://github.com/huyilin/DeliberativeAgent

Conflicts:
	history.xml
	src/template/DeliberativeTemplate.java
Data Structure changed