new share social
Merge pull request #85 from juancjara/master

update dev
conflict fixed
css delete min fixed
grunt
Merge pull request #86 from juancjara/development

last update i hope