implemented lockin config menu
Merge branch 'iss10' into develop