25414 Key resources (separated from Child groups, client request)
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/assets/frontend/css/reset.css
25414 Key resources (separated from Child groups, client request)