Fix angular's strange behaviour
Merge branch 'test' into dev
build,