FUN-25 : Page my account .
Merge branch 'master' of github.com:Lexy92/Funeral