Merge branch 'master' into Development

doc/build.md

@@ -39,10 +39,31 @@ In Debian/Ubuntu systems with OpenJDK you'll need OpenJFX as well, i.e. you'll n
     $ javac -version
     javac 1.8.0_66
 
-If `javac` is not found, or your version is anything less than `1.8.0_66`, then you'll need to [download and install the latest JDK]( http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) for your platform.
+If `javac` is not found, or your version is anything less than `1.8.0_66`, then follow the next steps, otherwise you can skip to step 2:
+
+###### 1.1 Debian based systems (Ubuntu)
+
+To install OpenJDK use:
+
+    $ sudo apt-get install openjdk-8-jdk maven libopenjfx-java
+
+To install the Oracle JDK use:
+ 
+    $ sudo add-apt-repository ppa:webupd8team/java
+    $ sudo apt-get update
+    $ sudo apt-get install oracle-java8-installer 
+
+If $JAVA_HOME is not present, add it to the .bashrc file
+
+    $ touch .bashrc
+    $ gedit .bashrc
+    $ export JAVA_HOME=/usr/lib/jvm/java-8-oracle
+    $ echo $JAVA_HOME 
+
+###### 1.2 Other systems
+
+[Download and install the latest JDK]( http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) for your platform.
 
-> _**TIP:** Here are [instructions](http://www.webupd8.org/2014/03/how-to-install-oracle-java-8-in-debian.html) for installing the JDK via `apt` on Debian/Ubuntu systems.
-> Bitsquare can be built with OpenJDK as well, but this hasn't been thoroughly tested yet._
 
 ##### 2. Enable unlimited Strength for cryptographic keys