Version 2.0.0
Merge branch 'development'

Conflicts:
	package.json
Merge branch 'development'
Version 2.1.0
Version 2.2.0