fix margin icons
Merge branch 'develop' of https://github.com/cuellarllar/carloscuellar

Conflicts:
	css/application.css