messy
Merge branch 'master' of /home/bitnami/repos/claudinechionh

Conflicts:
	drupal/includes/bootstrap.inc
	drupal/includes/common.inc
	drupal/includes/stream_wrappers.inc
Update contact box