Fixed #110
Merge branch 'master' into clojure-async

Conflicts:
	jar-persistence/src/main/java/com/sixsq/slipstream/persistence/Run.java