fulfilling and removing wishes
Merge branch 'master' of https://github.com/craighiller/serendipity
merge