Commit Before BasePathUrlUpdate
Merge remote-tracking branch 'origin/master'

Conflicts:
	QNLWebsite/WebContent/WEB-INF/tags/header.tag
	QNLWebsite/WebContent/WEB-INF/tags/linkCSS.tag
	QNLWebsite/WebContent/WEB-INF/tags/script.tag