Prolog....
Prolog...
Merge branch 'master' of https://github.com/ciech/jadrin
Merged, minor improvements
Conflicts:
	src/main/jadrin/bartender/BartenderAgent.java
	src/main/jadrin/bartender/WhatIsThat.java
	src/main/jadrin/ontology/Drink.java
	src/main/jadrin/resources/rules.pro
Merge branch 'master' of https://github.com/ciech/jadrin