Merge pull request #671 from hegek87/havoc

Finished functionality for status reply
Merge pull request #672 from hegek87/havoc

Figured out issue with modalInstance injection