build and resolve to angular 1.2.4
Merge branch 'test' into dev