change SelectLists to use models
Merge branch 'controller' into dev