Merge commit 'ec36762e294ae8f94788d975fa3cef5e800ea954'
fix bug responsive for register page
Merge commit '0f81bdf59d4a031d7ea0be96e4173942351ec3ac'
Merge commit 'b9f2202994e3c59a2e8cc19ff87359eee1ee27f6'
Merge commit 'ab5c977d3e8874bfe5360d253e82d16bd61e74a3'

Conflicts:
	src/main/webapp/assets/modules/bubble-chart/bubble-chart.fac.js