Merge branch 'master' into feature/language-server

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json

CHANGELOG.md

@@ -13,7 +13,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
-
 ## [2.0.0-beta.5]
 ### Changed
  - Upgraded to [[email protected]](https://github.com/TwitchBronBron/brightscript-language/tree/v0.1.14) that brings syntax fixes for using `then` as an object property name and now allows `function` as an argument type.
@@ -46,6 +45,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## [1.8.4] - 2019-03-04
+### Fixed
+ - Regression syntax highlighting issue that was not correctly colorizing `then` in conditional statements if it contains any uppercase letters.
+
+
+
 ## [1.8.3] - 2019-03-04
 ### Fixed
  - Several textmate grammar issues and added more variety in the captured tokens to provide better colorization
@@ -204,6 +209,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.0.0-beta.3]: https://github.com/TwitchBronBron/vscode-brightscript-language/compare/v2.0.0-beta.2...v2.0.0-beta.3
 [2.0.0-beta.2]: https://github.com/TwitchBronBron/vscode-brightscript-language/compare/v2.0.0-beta.1...v2.0.0-beta.2
 [2.0.0-beta.1]: https://github.com/TwitchBronBron/vscode-brightscript-language/compare/v1.8.2...v2.0.0-beta.1
+[1.8.4]: https://github.com/TwitchBronBron/vscode-brightscript-language/compare/v1.8.3...v1.8.4
 [1.8.3]: https://github.com/TwitchBronBron/vscode-brightscript-language/compare/v1.8.2...v1.8.3
 [1.8.2]: https://github.com/TwitchBronBron/vscode-brightscript-language/compare/v1.8.1...v1.8.2
 [1.8.1]: https://github.com/TwitchBronBron/vscode-brightscript-language/compare/v1.8.0...v1.8.1

package.json

@@ -1,7 +1,11 @@
 {
     "name": "brightscript",
     "displayName": "BrightScript Language",
+<<<<<<< HEAD
     "version": "2.0.0-beta.6",
+=======
+    "version": "1.8.4",
+>>>>>>> master
     "publisher": "celsoaf",
     "description": "Language support for Roku's BrightScript language.",
     "author": {