Merge branch 'master' of https://github.com/JITSystems/ijkh into web-interface
vendors and tariffs
gt fix
Merge branch 'web-interface' of https://github.com/JITSystems/ijkh