Added shipping fee to the buy now form
Merge branch 'makeup' into dev