Merge remote-tracking branch 'origin/RC20140724' into integration
Merge remote-tracking branch 'origin/RC20140821' into integration
Merge branch 'RC20140821' into integration
Merge branch 'integration' of https://github.com/NoesisEnergy/angular-ne into integration