Merge tag '1.15.4' into safari

# Conflicts:
#	platform/chromium/manifest.json

Fix el1t#88, catch up to 1.14.24

Use vAPI.getURL to filter details.file in vAPI.tabs.injectScript.

Also moved some scripts around.

Update xar-mackyle dl link to fix travis

Merge tag '1.14.14' into safari

# Conflicts:
#	.travis.yml
#	README.md
#	dist/README.md
#	src/_locales/fil/messages.json
#	src/about.html

Attempt to auto-update (fixes el1t#59)

Merge tag '1.12.5rc0' into safari

# Conflicts:
#	dist/README.md
#	src/_locales/gl/messages.json
#	src/_locales/sq/messages.json

Remove .DS_Store from directory

Merge tag '1.11.3b1' into safari

# Conflicts:
#	README.md

Merge tag '1.11.1b0' into safari

Code review for el1t#23 fix

slightly cleaner and safer approach