getting up to speed
Conflicts:
	.gitignore
Merge remote branch 'origin'

Conflicts:
	.gitignore
getting up to speed
Additional facts about cats.
Merged gitignore.
Fixed minor content error.
Fix #410 except the quote bug.
Fix travis failing hopefully.
Adding Dock Bounce when Desktop Notifications are enabled.
Merge pull request #417 from FredericJacobs/DockBounce

Adding Dock Bounce when Desktop Notifications are enabled.
Localization menu display tweaks
Prettier custom server dialog
Update Vietnamese translation (#331)
Fix missing bytes parameter. Thanks @arlolra
Move "type" in JSON to the root object.
Fix firefox/chrome commands

Create missing directories so build will run.
Properly show newlines in messages.
Merge pull request #419 from Dirbaio/newlines

Properly show newlines in messages.
Merge pull request #418 from millerkil/patch-1

Fix firefox/chrome commands