Merge Development History

This commit will add all changes we did in our development branch. No files will be changed.