FINAL MERGE

Hey guys,

this is the Pull Request for the final merge. As we discussed last week together with the POs tonight is code freeze. Hence I will merge this pull request at 23:59 PM today. Please make sure all your changes are merged into develop by then so your changes are contained in this ;)
Happy coding!