Merge "Upgrade angular to 1.3.2"