Merge branch 'develop'

base_v3/Dockerfile

base_v3/entrypoint.sh

base_v3/files/background.jpg

base_v3/files/dot_fluxbox/apps

base_v3/files/dot_fluxbox/init

base_v3/files/dot_fluxbox/keys

base_v3/files/dot_fluxbox/lastwallpaper

base_v3/files/dot_fluxbox/menu

base_v3/files/dot_fluxbox/overlay

base_v3/files/dot_fluxbox/windowmenu

base_v3/files/index.html

base_v3/files/noVNC.tar.gz

base_v3/files/run_novnc.sh

base_v3/files/run_vnc.sh

base_v3/files/supervisord.conf

base_v3/files/supervisord_novnc.conf

base_v3/files/supervisord_vnc.conf

base_v3/files/xstartup

base_v4/Dockerfile

base_v4/entrypoint.sh