Preparation for Server side pdf generation
Fixed conflicts
Database.yml is an asshole