Merge branch 'master' into renewal-2014

Conflicts:
services/sure/index.html