MainOne - encoding confliction  / algorithm final
Merge remote-tracking branch 'origin/Algorithm' into index_background

Conflicts:
	WebContent/common/modal_content.jsp
	WebContent/searchProcess.jsp
	src/main/search/GoogleSearch.java
Merge remote-tracking branch 'origin/almost' into index_background
sujung