initialize
Merge branch 'master' of https://github.com/pencilkill/yiii2a

Conflicts:
	composer.json
	composer.lock
	vendor/autoload.php
	vendor/composer/autoload_real.php