Removed .orig files from merge
Restore db config and gems
Fixed js and css inclusion