Merge branch 'release-0.1'

Change-Id: Ie0d8c15e8466ef5ba7cfb59f64c90f6ba343a591
Disabled factory for now

Change-Id: I09d71d46906216b87b09da526a33133031272f84
Merge branch 'hotfix-0.1.1' into develop

Change-Id: Ibffaf131c8a08e38003bb0cc6290ee7807fb0e7c