Update

Failed to synch..
Merge branch 'master' of https://github.com/leowns/spotted

Conflicts:
	composer.json
	composer.lock