Add Joaquins branch and fix merge conflicts.
Add icomoon icons, font directory,
and img directory to grunt. Also
took static html and connected to
Angular.
merge with jay branch