update 1.1.1
Merge remote-tracking branch 'upstream/master' into testing

Conflicts:
	includes/js/third-party.js
	style.css
	style.less