Merge branch 'User-settings-post' of github.com:PubDig/pubdig