Kjetil merge
Merge branch 'master' of http://github.com/thomasSve/SKS-2.0 into henri