- composer change
Merge branch 'master' of github.com:khromov/php-microtemplate-oo

Conflicts:
	composer.json
Fixes for composer.js