fixar filer entity
Merge branch 'sean'
map
Merge branch 'master' into sebastian
:(