Merge branch 'development'
updates
Merge branch 'development'

Conflicts:
	scripts/install
updates
Merge branch 'development'
Merge branch 'development'
updates
Merge branch 'master' into development