merged the angularjs branch