add lines View, fix lines bug, fix hql in stations
Merge remote-tracking branch 'origin/develop' into develop