logo icon colour profile
Merge branch 'master' of https://github.com/okfn/foundation

# By Nick Stenning
# Via Nick Stenning
* 'master' of https://github.com/okfn/foundation:
  Upgrade to Django 1.6.5 -- several security patches
circles around social icons
Merge branch 'master' of https://github.com/okfn/foundation

# By Nick Stenning
# Via Nick Stenning
* 'master' of https://github.com/okfn/foundation:
  Upgrade django-cms and aldryn-search to released versions