Revert "Porva"

This reverts commit 9641ac440f3536ad01b61cc4d7ba0807a4b507d7.

Conflicts:
	composer.lock
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	composer.lock