Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/nelox/css/style.css
update
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/nelox/css/style.css
Merge remote-tracking branch 'origin/master'
update