Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/certified_athlete/community/businesses/sponsors/admin.php
	plugins/certified_athlete/community/locations/states/admin.php
	plugins/certified_athlete/community/members/athletes/admin.php
	plugins/certified_athlete/community/members/parents/admin.php
	plugins/certified_athlete/community/swag/admin.php
	plugins/certified_athlete/community/tips/admin.php
	themes/casleevalentine/functions.php
	wp-content/plugins/certified_athlete/community/businesses/admin.php

	wp-content/plugins/certified_athlete/community/businesses/affiliates/admin.php

	wp-content/plugins/certified_athlete/community/businesses/sponsors/admin.php
	wp-content/plugins/certified_athlete/community/events/admin.php

	wp-content/plugins/certified_athlete/community/locations/addresses/admin.php
	wp-content/plugins/certified_athlete/community/locations/admin.php

	wp-content/plugins/certified_athlete/community/locations/regions/admin.php

	wp-content/plugins/certified_athlete/community/locations/states/admin.php
	wp-content/plugins/certified_athlete/community/organizations/admin.php