Merged master branch

Conflicts:
	src/main/java/io/bitsquare/BitSquare.java

src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.j
ava

src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.
java