Merge branch 'master' into simplatform

src/main/webapp/WEB-INF/jsp/clinic/state.jsp

@@ -44,7 +44,7 @@ function deactiveReloadTimer() {
 function searchPatients() {
 	var keyword = $("#searchKeyword").val();
 
-	location.href = "./state?searchText="+keyword;
+	location.href = "./state?searchText="+encodeURIComponent(keyword);
 }
 
 function retrieveStateData(page) {