Merge branch 'kyle'
Merge branch 'kyle'
Added default message for user registration email
Merge branch 'cory'

Conflicts:
	inc/multisite_overrides.php
Merge branch 'master' into kyle