style
Merge remote-tracking branch 'origin/master'

Conflicts:
	wordpress/wp-content/themes/authorit/footer.php
style