update entities
Merge branch 'master' of https://github.com/poderopedia/plug-and-play-1.0-RC