fix plugin load check
add branch aliases
Merge branch '0.x'

Conflicts:
	composer.json