cmt
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/Models/Entities/User.php
	application/My/Factory/MyEntityManagerFactory.php