pulling
merge conflict
fixes menubar/header
Merge branch 'master' of github.com:Shadae/Scamazon into davida_products