events trigering
Merge branch 'master' of github.com:Keyang/costainApp
Changes to cms and app render code
Resolve conflict