Fixes pledge/bounty buttons
Resolve merge conflicts
Merge branch 'angular1.2'