changes in entites
changes entites .. and ajs .. name against title
Merge remote-tracking branch 'origin/develop' into develop