merged with server copy
Merge branch 'master' of github.com:wiless/plasma-wp