Merge remote-tracking branch 'origin/release-candidate' into RC20140724

* origin/release-candidate:
Merge remote-tracking branch 'origin/RC20140724' into release-candidate

* origin/RC20140724:
beautify
Merge remote-tracking branch 'origin/RC20140821' into release-candidate

* origin/RC20140821:
  BZ-12892: Updating code format
  BZ-12892: Grunt tasks for angular-ne
Merge remote-tracking branch 'origin/release-candidate' into RC20140821

* origin/release-candidate:
  beautify