Fix broken linux build.
Merge branch 'master' of github.com:skogler/sweb into skogler-master

Conflicts:
	CMakeLists.txt