sync
Merge branch 'master' of https://github.com/malcalde/FindTheMate

Conflicts:
	manifest.json
	src/achievement.js