Brian:added editprod combobox
Merge branch 'dev' of https://github.com/FCPDIT/TeamProject into dev