Change-Id: Ieb16ad32b0a6313cdb88a4f6cd8238de946580d9
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/jctrl/jdauction/ctrl/JsonAuction.java

Change-Id: Idc138e773789904ef469c0fc66f82a6c85526a98