2 rules
Merge remote-tracking branch 'origin/master'

Conflicts:
	inhabitedisland/src/main/java/ua/redpinguins/inhabitedisland/drools/RulesExecutor.java
	inhabitedisland/src/main/resources/ua/redpinguins/inhabitedisland/drools/Rules.drl