Removed fireworks
Removed fireworks remains
Merge branch 'master' into add_service

Conflicts:
	api/src/controllers.php