Picture 228 size
Merge remote-tracking branch 'origin/master'

Conflicts:
	_ide_helper.php
	public/web/guru.css