Removed DBControllerSingleton since we are not using it
Updated project for testing mail stuff