fixed user wishes
gMerge branch 'master' of github.com:craighiller/serendipity