Merge branch 'release/2014031001' into develop
Updated deploy code such that secrets get linked.
Merge branch 'release/2014031002'