finished integration tests
Merge branch 'develop' of github.com:fuag15/midgard-productions into develop