adds historical saqs and scans info on merchant show page
add simple form to new merchant, saq, scan
adds merchant association to scan, comments out notes until we figure out what is going on
adds a bunch of bootstrap styles to merchant#show
Merge branch 'updateMerchantShowView'