Think implementation
Merge branch 'master' of git@github.com:yroffin/jarvis.git

Conflicts:
	bob/bob-aiml/src/main/java/org/jarvis/main/model/parser/IAimlCategory.java
	bob/bob-aiml/src/test/resources/core/default/default.xml