promise added
Merge branch 'master' of https://github.com/gleb23/inhabited_island

Conflicts:
	inhabitedisland/src/main/java/ua/redpinguins/inhabitedisland/PromiseProcessor.java
Merge branch 'master' of https://github.com/gleb23/inhabited_island