Improving docker building and image storage/loading
Merge branch 'dev'