Merge commit '674b5a5d86aaeeefa26b30c21d9431525e1d9596'
Merge commit 'f957329e0dc18d85097eaa4e84b71ee4446d60e8'
add logo accounts sign in for register page and add user profile page
Fix tour guide duplicate code
Merge commit 'c6c3e019c0890bb6feafb280429a7ba5942fd262'

Conflicts:
	src/main/webapp/assets/modules/common/utils.fac.js
	src/main/webapp/assets/modules/header/header.ser.js
	src/main/webapp/assets/modules/signin/signin.con.js
Merge commit '12533318374a75042f5bb92830fdd30ae4a79ad6'