Merge branch 'master' of github.com:eladnoor/component-contribution

Conflicts:
	matlab/getKeggpKas.m
Merging changes to getKeggpKas