Going back
Fix problems with angular wrong pull
fix
Merge branch 'master' into merge_problem