Frameowkr update common 0.5.4
Merge branch 'develop' into feature/common2

Conflicts:
	composer.json
	composer.lock