Added Merchant Info

New columns into ddbb
Changed Edit and Show pages
Edit Merchant Model
Created Awards Scaffold