Commit
Merge branch 'master' of github.com:Alex1111/CLSM

Conflicts:
	profiles/CLSM/amd64/package.keywords