add StationOnLineMain.java, StationOnLineManager.java,
StationOnLineManagerImpl.java, edit StationsOnLineDAO.java,
StationsOnLineDAOImpl.java, addLines.jsp and editLine.jsp
Merge remote-tracking branch 'origin/develop' into develop