Update contact context and remove phone block, resolves #50
Merge branch 'master' into feature/freshdesk-widget

Conflicts:
	drupal/sites/all/modules/features/ofc_contact/ofc_contact.box.inc
Add freshdesk widget.
Merge branch 'feature/freshdesk-widget' into dev
Merge branch 'master' into dev
Upgrade google analytics module from 1.3 to 2.0.
Security update: Date.
Security update: Drupal 7.30.
default settings
Merge branch 'feature/security-20140729' into dev
Security updates 2014-08-05
default settings
Merge branch 'release/2014-08-05'