Merge branch 'hotfix/0.3.1'
use latest version of docker and fabalicious
Merge branch 'release/0.4'
Merge tag '0.4' into develop

tagging 0.4