Merge branch 'develop'
[#23] Update web/ directory files
Merge branch 'task-23-update_web_directory' into develop