Merge remote-tracking branch 'VanRoy/master' into staging_065

Conflicts were:
- functions/icons.zsh: The Java Segment was added on master, but on next
were added various Segments with icons in the meantime.
- powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox
Segment was added on next.

1 files changed, 2 insertions, 0 deletions

diff --git a/README.md b/README.md
index 9120230b..bdb0332e 100644
--- a/README.md
+++ b/README.md
@@ -135,6 +135,8 @@ The segments that are currently available are:
     * `rust_version` - Display the current rust version and [logo](https://www.rust-lang.org/logos/rust-logo-blk.svg).
 * **Swift Segments:**
     * `swift_version` - Show the version number of the installed Swift.
+* **Java Segments:**
+    * `java_version` - Show the current Java version.
 
 **Cloud Segments:**
 * **AWS Segments:**