Reformat code
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	wordpress/wp-content/themes/Portfolio/js/main.js