Merge branch 'hotfix-0.1.1'

Change-Id: Iacff70565a655c698aef0e1dfe05d98ebce7df35
Fixed pom

Change-Id: If48780a833b796e169cd3e4b9bc0c9efceb079d9
Merge branch 'hotfix-0.1.2' into develop

Conflicts:
	pom.xml

Change-Id: I462c03e0a5ce55e092a19da756ac3c131abf29fa