Merge branch 'dev' of https://github.com/iotaledger/iri into dev

# Conflicts:
#	Dockerfile
#	pom.xml
#	src/main/java/com/iota/iri/IRI.java
#	src/main/java/com/iota/iri/conf/Configuration.java
#	src/main/java/com/iota/iri/storage/rocksDB/RocksDBPersistenceProvider.java