edit pom; fix lib conflict
edit charset
Create allLines.jsp and edit LineManagerController
Merge remote-tracking branch 'origin/develop' into develop