resolved ds store conflicts, added plugins
Merge branch 'master' of github.com:jeena/seinheit.ch