Updating Font Awesome; Tidying up add content UI
Merge branch 'humbucker' of github.com:blueriver/MuraCMS into humbucker