Merge pull request #386 from tribal-tec/master

Fix build w/ Qt 4.6, fix cppcheck issues
Fix grammar for view sattr
Merge pull request #387 from eile/master

Fix grammar for view sattr
Server lib no longer depends on client library