-
Merge branch 'master' of https://github.com/cedtanghe/Elixir

Conflicts:
	src/modules/Console/Command/ModelGenerate.php