Merge branch 'release/2014062901' into develop
Update deployment config.
Merge branch 'release/2014062902'