Refs #5538 - Added regression test
Add filtering for site entities, faster filtering
Merge branch '5539_18' into 1.8
Refs #5538: Adds missing attributes to ElggUser and ElggCoreUserTest (by Paweł Sroka)
fixed a notice when accessing $CONFIG->icon_sizes
Merge branch '1.8'

Conflicts:
	engine/classes/Elgg/AttributeLoader.php