[Bug 428193] Improved Guice injection
fixed some interpreter bugs

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
Merge branch 'Bug428193' of https://github.com/OLibutzki/smarthome into
Bug428193


Signed-off-by: Oliver Libutzki <oliver@libutzki.de>