Moved the bootstraps fonts to the theme folder so as to be available for loading
Merge remote-tracking branch 'origin/master'
Corrected floating of the add files button
Reordered the css imports to stop the bootstrap ones override style.css