Merge branch 'release/v20140803'
Merge branch 'release/V20140803.2'
T140803.0004 - Updated address on contact page
Merge branch 'hotfix/T140803.0004' into develop