Merge branch 'master' of http://159.223.171.199:10439/r/JiuMuMES

# Conflicts:
#	UI-Project/src/views/ManualReporting/manualReporting.vue