Weekly merge to Master

added 2 commits

• 63aa7102 - Update javadoc to generate to public/ instead of public/docs for a cleaner url
• 11189bbf - Merge branch 'chore/javadoc-dir' into 'dev'

Compare with previous version

added 2 commits

• 9d80a472 - Extend NavBarController in UploadImages
• fff4ba16 - Merge branch 'fix/navbarcontroller-uploadImages' into 'dev'

Compare with previous version

added 2 commits

• ffd3b7c3 - Updated the design of upload images and create album
• 9782ffcf - Merge branch 'redesign/uploadedImgaes' into 'dev'

Compare with previous version

enabled an automatic merge when the pipeline for 9782ffcf succeeds

merged

mentioned in commit aa9515b5