Merge branch 'release' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into release