angular updated to 1.2.13
merge
gruntfile ang package.json added