Merging in develop branch changes with email alert functionality.
Merge branch 'develop'
Disabling show_sql on persistence.xml to reduce logging output