Whitespace removal
Update README.md
Merge branch 'develop' into 2.1
Merge remote-tracking branch 'origin/develop' into 2.1
Composer lock update
Updating lock file
Merge remote-tracking branch 'upstream/2.1' into 2.1

Conflicts:
	composer.lock
Remove .DS_Store files
Merge branch 'develop' into 2.1-noiselabs