fixed new codelist staging under Neo
Merge branch 'dev' of https://github.com/cotrix/cotrixrep.git into dev