add angular
Merge branch '20130622-1'