Merge branch 'sowon' into develop

src/main/webapp/WEB-INF/views/marketing/PollListForm.html

@@ -367,7 +367,7 @@
 
 		var jsonData = JSON.stringify(params);
 		gagajf.ajaxJsonSubmit('/marketing/poll/voter/list', jsonData, function(dataList) {
-			gridOptionsVote.api.setRowData(dataList);
+			gridOptionsVote.api.setRowData(dataList.pollList);
 		});
 
 	}