added secret property to user, removed unnecessary maven dependencies, added functionality for email, organized spring config xml
Merge remote-tracking branch 'origin/master'