Adding floobits files
Merge branch 'master' into floo