solid sync
Merge branches 'solid' and 'master'
adding font awesome