Split up startup into support file
Split up startup into support file
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json