HOI implementations
Feature2 added.
feature2 implementations added
Masterfile and implementations added.
Merge branch 'feature_2' into feature_1
Merge branch 'master' into feature_1