Update no #342
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/css/main-me.css
	dist/js/main.js
	page2-archive.php