integrated angularjs
merging in changes