some updates
Merge branch 'master' of https://github.com/SEprojektteam2/sewinf