fixed conflict
Merge branch 'master' of https://github.com/craighiller/serendipity