Merge branch 'hotfix-0.1.2'

Change-Id: I4fa88ad02762cc8dc0082cb39f8b34ed9c126100
Fixed codeStyleSettings.

Change-Id: Id3d7453a748ad401b5ab24765b4a1a65f8512278
Merge "Fixed codeStyleSettings."
Merge branch 'release-0.2'

Conflicts:
	.idea/codeStyleSettings.xml

Change-Id: I2b643d64a2dd1acd3cef34a9b809cc171686264e
Hotfix v0.2.1

Change-Id: I88607130882d64ac2a71d6d0e93d369b9641b381
Merge branch 'hotfix-0.2.1' into develop

Change-Id: Ib24f24e2e19e92e7b195f13d573ad73151c25336