fixed that conflict... my bad
Merge branch 'master' of https://github.com/roed314/OMS