fix parent group
Merge remote-tracking branch 'origin/master'

Conflicts:
	behaviors/ContentBehavior.php
Fix search algoritm