started to fix the controllers
fixed infinite loop and email serialization
Merge remote-tracking branch 'danpersa/master'
remove spel from annotation