Merge pull request #388 from gogolander/test

head changed
Upgrade and fix merge git
Fallo e basta!
Merge remote-tracking branch 'upstream/test' into test
Ultimate upgrade style layout and css file
Merge pull request #389 from panseo/test

Ultimate upgrade style layout and css file
social