Update composer.json
fix rules
fix rules
Merge sangkil/master

Conflicts:
	composer.json
init
init
init