Merge pull request #1 from oliver204/master

update
Merge pull request #2 from oliver204/master

Payment Gateway
minor css

css changes
shipping change

msql
Merge pull request #6 from hugorut/master

msql