Bastion: migrating from AngularJS 1.2.0-rc3 to 1.2.0.
Merge pull request #3359 from waldenraines/devel-angular

Bastion: migrating from AngularJS 1.2.0-rc3 to 1.2.0.