add application awareness of execution environement
Merge branch 'develop' of https://github.com/Klickrent/klapi into develop