Merging
Merge branch 'develop' of https://github.com/ripaclub/matryoshka.git into develop

Conflicts:
	library/Matryoshka/Model/ModelInterface.php
Updated composer