Add mail.properties as a link to a local-only file.  This holds
sensitive information.  The format of the file is:

mail.default.from=Friendly Display Name <actual@emailaddress.com>
mail.debug=false
mail.transport.protocol=smtp
mail.host=<mailhost>
mail.port=<port>
mail.username=<username>
mail.password=<password>
mail.smtp.starttls.enable=true
mail.smtp.auth=true
Correction to name of rolling file appender in logback.xml
Added multiple role capability via account_role entity
Update persistence.properties to use vgdev database
Merge conflicts resolved in db scripts and .project