Merge commit '8e2e7b3d2e89fba259e2c4914bec8d1da7995695'

Conflicts:
	src/main/webapp/assets/modules/navigation/navigation.ser.js
and fix bug responsive
Merge commit 'd4a5e553b0bf434e5676ed99bdbc27d86d310548'

Conflicts:
	src/main/webapp/assets/modules/navigation/navigation.ser.js