fixing installation issue + some validations

Signed-off-by: Ondrej Rafaj <ondrej.rafaj@fuerteint.com>
Merge branch 'master' of github.com:Ridiculous-Innovations/EnterpriseAppStore