added changes to deal with update view
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
replaced AObject by Element in messages.