add final info feature/2
Merge remote-tracking branch 'origin/feature2' into develop