Signed-off-by: An <lasdtc@gmail.com>
Merge branch 'master' into NEW-MASTER

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebRoot/about_us.jsp
	WebRoot/common/headerNav.jsp
	WebRoot/common/resource_side_bar.jsp
	WebRoot/css/resource.css
	WebRoot/js/QA.js
	WebRoot/js/QA_Answer.js
	WebRoot/js/about_us.js
	WebRoot/js/homepage.js
	WebRoot/js/messager.js
	WebRoot/js/resource.js
	WebRoot/js/resource_class.js
	WebRoot/js/resource_side_bar.js
	WebRoot/js/tech_cyclopedia.js
	WebRoot/js/tech_cyclopedia_blogR.js
	WebRoot/js/tech_cyclopedia_blogW.js

Signed-off-by: An <lasdtc@gmail.com>