Merge branch 'study-angularjs'