+
Merge remote-tracking branch 'master/master'

Conflicts:
	Core.php
	Core/Block/View.php
	Core/Model/Collection/Abstract.php
	Core/Model/Entity/Abstract.php
	Core/Model/Mapper/Abstract.php