added font awesome, fixed buttons
added font awesome, fixed buttons
Merge branch 'flat_buttons'