Added fl, float-none class
Merge branch 'master' into develop
Removed map file