User modelfix
fix mail & author
Merge branch 'master' of github.com:fetsite/fetsite