General improvements...
Merge branch 'master' of github.com:victorjonsson/cXense-4-WordPress