user entity
Merge branch 'master' of https://github.com/whatsup-project/whatsup
overide fos template