remove swap file
only load services.xml if FOSUSerBundle is loaded
change EmailTemplateAdmin
add missing fromEmail
review config file