Merge pull request #79 from JoseMarkos/develop

Changing negative margin in icons
Changed code for solving Bootstrap carousel conflict with Mootools
Merge pull request #81 from jatitoam/develop

Changed code for solving Bootstrap carousel conflict with Mootools
Merge remote-tracking branch 'JSwright/develop' into develop