remove glines
put back max_cidr stuff to conf files
Merge branch 'feature/remove_glines' into develop