Merge origin/master

Conflicts:
	public_html/css/style.less
	public_html/img/Thumbs.db
	public_html/img/min-logo.png
	public_html/index.html
	public_html/js/global.js