Merge branch 'master' of https://github.com/sklay/njztsm

Conflicts:
	manager/sklay-web/src/main/webapp/WEB-INF/views/manager/member/lineChart.jsp
Merge branch 'master' of https://github.com/sklay/njztsm