fixe merge in deploy
IST-110, added zero-inv selector
Merge branch 'master' into production