Merge branch 'release/1.1'
Merge branch 'release/1.1.1'
Added libraries
Merge branch 'release/1.2'

Conflicts:
	.gitignore
Merge branch 'develop'

Conflicts:
	.gitignore