Added components.
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/pages/element.php
	core/core.php
	core/types/users.php