entity edited
Merge branch 'master' of https://github.com/sainthsu/flakor-cplusplus

merge