added font-awesome and public dir with rotate icons
* fixed merge errors