add from branch
Merge branch 'jun'

Conflicts:
	app/Console/Command/TestShell.php