Searches for Resonant and Non-resonant Higgs Boson Pair-production in the bb?+?- Decay Channel with 36.1 fb-1 PP Collision Data at ?s = 13 TeV with the ATLAS Detector