facelift 3
small bugfixes
location fix + manifest
manifest
asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	manifest.json
manifest