Edit addLines.jsp and LineManagerController.java
Merge remote-tracking branch 'origin/develop' into develop