merged
Merge branch 'master' of https://github.com/evilband7/porn.git

Conflicts:
	application/My/Factory/MyEntityManagerFactory.php
before fix dirty work tree
Merge remote-tracking branch 'origin/master'